Changeset 25150 in vbox

Timestamp:

Dec 2, 2009 2:40:46 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55565

Message:

Main: build fix

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (4 diffs)
• win/NetIf-win.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -284 +284 @@
      *  <code>
      *      AutoVMCaller autoVMCaller (this);
-     *      CheckComRCReturnRC (autoVMCaller.rc());
+     *      if (FAILED(autoVMCaller.rc())) return autoVMCaller.rc();
      *      ...
      *      VMR3ReqCall (mpVM, ...
@@ -350 +350 @@
      *  <code>
      *      Console::SaveVMPtr pVM (mParent);
-     *      CheckComRCReturnRC (pVM.rc());
+     *      if (FAILED(pVM.rc())) return pVM.rc();
      *      ...
      *      VMR3ReqCall (pVM, ...

trunk/src/VBox/Main/include/MachineImpl.h

@@ -353 +353 @@
      *
      *      Machine::AutoStateDependency<MutableStateDep> adep(mParent);
-     *      CheckComRCReturnRC(stateDep.rc());
+     *      if (FAILED(stateDep.rc())) return stateDep.rc();
      *      ...
      *      // code that depends on the particular machine state

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -677 +677 @@
      * STDMETHODIMP Component::Foo()
      * {
-     *     AutoCaller autoCaller (this);
-     *     CheckComRCReturnRC (autoCaller.rc());
+     *     AutoCaller autoCaller(this);
+     *     if (FAILED(autoCaller.rc())) return autoCaller.rc();
      *     ...
      * </code>
@@ -702 +702 @@
      * STDMETHODIMP Component::Bar()
      * {
-     *     AutoLimitedCaller autoCaller (this);
-     *     CheckComRCReturnRC (autoCaller.rc());
+     *     AutoLimitedCaller autoCaller(this);
+     *     if (FAILED(autoCaller.rc())) return autoCaller.rc();
      *     ...
      * </code>
@@ -982 +982 @@
      * {
      *     AutoMayUninitSpan mayUninitSpan (this);
-     *     CheckComRCReturnRC (mayUninitSpan.rc());
+     *     if (FAILED(mayUninitSpan.rc())) return mayUninitSpan.rc();
      *     if (mayUninitSpan.alreadyInProgress())
      *          return S_OK;
@@ -1305 +1305 @@
 
                 // return on fatal error, but continue on warning or on success
-                CheckComRCReturnRC (rc);
+                if (FAILED(rc)) return rc;
 
                 rc = foo->method2();

trunk/src/VBox/Main/win/NetIf-win.cpp

@@ -1066 +1066 @@
         if(SUCCEEDED(rc))
         {
-            CheckComRCReturnRC(rc);
+            if (FAILED(rc)) return rc;
             progress.queryInterfaceTo(aProgress);
 
@@ -1120 +1120 @@
         if(SUCCEEDED(rc))
         {
-            CheckComRCReturnRC(rc);
+            if (FAILED(rc)) return rc;
             progress.queryInterfaceTo(aProgress);
 
@@ -1175 +1175 @@
                 if(SUCCEEDED(rc))
                 {
-                    CheckComRCReturnRC(rc);
+                    if (FAILED(rc)) return rc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1237 +1237 @@
                 if(SUCCEEDED(rc))
                 {
-                    CheckComRCReturnRC(rc);
+                    if (FAILED(rc)) return rc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1299 +1299 @@
                 if(SUCCEEDED(rc))
                 {
-                    CheckComRCReturnRC(rc);
+                    if (FAILED(rc)) return rc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1359 +1359 @@
                 if(SUCCEEDED(rc))
                 {
-                    CheckComRCReturnRC(rc);
+                    if (FAILED(rc)) return rc;
 //                    progress.queryInterfaceTo(aProgress);