Changeset 42636 in vbox for trunk

Timestamp:

Aug 6, 2012 6:29:44 PM (12 years ago)

Author:

vboxsync

Message:

Build fix.

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• src-client/GuestSessionImpl.cpp (modified) (3 diffs)

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

@@ -305 +305 @@
  * starting parameters around.
  */
-struct GuestProcessStartupInfo
-{
+class GuestProcessStartupInfo
+{
+public:
+
     GuestProcessStartupInfo(void)
         : mFlags(ProcessCreateFlag_None),
@@ -332 +334 @@
 public:
 
-    GuestProcessStreamValue() { }
+    GuestProcessStreamValue(void) { }
     GuestProcessStreamValue(const char *pszValue)
         : mValue(pszValue) {}
 
     GuestProcessStreamValue(const GuestProcessStreamValue& aThat)
-           : mValue(aThat.mValue) {}
+           : mValue(aThat.mValue) { }
 
     Utf8Str mValue;

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

@@ -83 +83 @@
         return VINF_SUCCESS;
     HRESULT hr = mProgress->SetCurrentOperationProgress(uPercent);
-    ComAssertComRC(hr);
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
 
     return VINF_SUCCESS;
@@ -205 +206 @@
                     /* Startup process. */
                     ComObjPtr<GuestProcess> pProcess;
-                    int rc = pSession->processCreateExInteral(procInfo, pProcess);
+                    rc = pSession->processCreateExInteral(procInfo, pProcess);
                     if (RT_SUCCESS(rc))
                         rc = pProcess->startProcess();
@@ -499 +500 @@
                 /* Startup process. */
                 ComObjPtr<GuestProcess> pProcess;
-                int rc = pSession->processCreateExInteral(procInfo, pProcess);
+                rc = pSession->processCreateExInteral(procInfo, pProcess);
                 if (RT_SUCCESS(rc))
                     rc = pProcess->startProcess();