Changeset 26511 in vbox
- Timestamp:
- Feb 14, 2010 9:39:55 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
.scm-settings (modified) (1 diff)
-
src/VBox/Main/ApplianceImpl.cpp (modified) (1 diff)
-
src/VBox/Main/DisplayResampleImage.cpp (modified) (1 diff)
-
src/VBox/Main/MachineImpl.cpp (modified) (1 diff)
-
src/VBox/Main/VirtualBoxImpl.cpp (modified) (1 diff)
-
src/VBox/Main/darwin/NetIf-darwin.cpp (modified) (4 diffs)
-
src/VBox/Main/include/Performance.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/.scm-settings
r26509 r26511 89 89 vboxvideo_drm.c: --no-convert-tabs 90 90 *linux.mod.c: --no-convert-tabs 91 */src/VBox/Main/DisplayResampleImage.cpp: --no-convert-tabs 91 92 92 93 -
trunk/src/VBox/Main/ApplianceImpl.cpp
r25927 r26511 3368 3368 3369 3369 if (m->pReader) 3370 {3371 delete m->pReader;3372 m->pReader = NULL;3373 }3370 { 3371 delete m->pReader; 3372 m->pReader = NULL; 3373 } 3374 3374 3375 3375 // see if we can handle this file; for now we insist it has an ".ovf" extension -
trunk/src/VBox/Main/DisplayResampleImage.cpp
r24942 r26511 1 1 /** @file 2 *3 2 * Image resampling code, used for snapshot thumbnails. 4 3 */ -
trunk/src/VBox/Main/MachineImpl.cpp
r26459 r26511 9017 9017 if (aReason == Uninit::Normal) 9018 9018 mData->mSession.mProgress->notifyComplete(S_OK); 9019 else9019 else 9020 9020 mData->mSession.mProgress->notifyComplete(E_FAIL, 9021 9021 COM_IIDOF(ISession), -
trunk/src/VBox/Main/VirtualBoxImpl.cpp
r26389 r26511 2591 2591 { 2592 2592 Bstr mid = machineId.toUtf16(); 2593 Bstr sid = snapshotId.toUtf16();2593 Bstr sid = snapshotId.toUtf16(); 2594 2594 2595 2595 switch (what) -
trunk/src/VBox/Main/darwin/NetIf-darwin.cpp
r26163 r26511 157 157 158 158 #define ROUNDUP(a) \ 159 ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))159 ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) 160 160 #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) 161 161 … … 217 217 aiMib[1] = PF_ROUTE; 218 218 aiMib[2] = 0; 219 aiMib[3] = PF_INET; /* address family */219 aiMib[3] = PF_INET; /* address family */ 220 220 aiMib[4] = NET_RT_DUMP; 221 221 aiMib[5] = 0; … … 291 291 aiMib[1] = PF_ROUTE; 292 292 aiMib[2] = 0; 293 aiMib[3] = 0; /* address family */293 aiMib[3] = 0; /* address family */ 294 294 aiMib[4] = NET_RT_IFLIST; 295 295 aiMib[5] = 0; … … 440 440 aiMib[1] = PF_ROUTE; 441 441 aiMib[2] = 0; 442 aiMib[3] = 0; /* address family */442 aiMib[3] = 0; /* address family */ 443 443 aiMib[4] = NET_RT_IFLIST; 444 444 aiMib[5] = 0; -
trunk/src/VBox/Main/include/Performance.h
r26128 r26511 122 122 ProcessList::iterator it; 123 123 for (it = mProcesses.begin(); it != mProcesses.end(); it++) 124 if (it->first == process)125 return *it;124 if (it->first == process) 125 return *it; 126 126 127 127 /* Not found -- add new */
Note:
See TracChangeset
for help on using the changeset viewer.

