vbox的更動 55222 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

時間撮記:

2015-4-13 下午05:27:27 (10 年 以前)

作者:

vboxsync

訊息:

Main/Console: next attempt at making some g++ versions happy

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (修改) (2 筆差異)

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

@@ -5919 +5919 @@
  */
 HRESULT Console::i_onlineMergeMedium(IMediumAttachment *aMediumAttachment,
-                                   ULONG aSourceIdx, ULONG aTargetIdx,
-                                   IProgress *aProgress)
+                                     ULONG aSourceIdx, ULONG aTargetIdx,
+                                     IProgress *aProgress)
 {
     AutoCaller autoCaller(this);
@@ -6141 +6141 @@
         alock.release();
 
+        IMediumAttachment *pAttachment = aAttachments[i];
         int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY,
                                    (PFNRT)i_reconfigureMediumAttachment, 13,
                                    this, ptrVM.rawUVM(), pcszDevice, lInstance, enmBus, fUseHostIOCache,
                                    fBuiltinIOCache, false /* fSetupMerge */, 0 /* uMergeSource */,
-                                   0 /* uMergeTarget */, *aAttachments[i], mMachineState, &rc);
+                                   0 /* uMergeTarget */, pAttachment, mMachineState, &rc);
         if (RT_FAILURE(vrc))
             throw setError(E_FAIL, tr("%Rrc"), vrc);