Changeset 49350 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 31, 2013 5:08:48 PM (11 years ago)

Author:

vboxsync

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

90368

Message:

Build fix.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImpl.cpp (modified) (1 diff)
• GuestCtrlPrivate.cpp (modified) (2 diffs)
• GuestProcessImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -316 +316 @@
                     if (rc == VERR_NOT_FOUND)
                     {
-                        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+                        alock.acquire();
 
                         rc = pSession->dispatchGeneric(pCtxCb, pSvcCb);

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -1060 +1060 @@
             while (itCurEvent != mWaitEventGroups[(*itEvents)].end())
             {
-             if (itCurEvent->second == pEvent)
-             {
-                 itCurEvent = mWaitEventGroups[(*itEvents)].erase(itCurEvent);
-                 break;
-             }
-             else
-                 itCurEvent++;
+                if (itCurEvent->second == pEvent)
+                {
+                    mWaitEventGroups[(*itEvents)].erase(itCurEvent);
+                    break;
+                }
+                else
+                    itCurEvent++;
             }
         }
@@ -1179 +1179 @@
 
 GuestWaitEventBase::GuestWaitEventBase(void)
-    : mCID(0),
+    : mfAborted(false),
+      mCID(0),
       mEventSem(NIL_RTSEMEVENT),
-      mfAborted(false),
       mRc(VINF_SUCCESS),
       mGuestRc(VINF_SUCCESS)

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -119 +119 @@
 #ifdef DEBUG
                 LogFlowThisFunc(("Signalling events of type=%ld, process=%p resulted in rc=%Rrc\n",
-                                 aType, mProcess, rc2));
+                                 aType, &mProcess, rc2));
 #endif
                 break;