Changeset 22786 in vbox for trunk

Timestamp:

Sep 4, 2009 2:31:30 PM (15 years ago)

Author:

vboxsync

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

51973

Message:

build fix (msc doesn't like #ifdefs inside macro parameter lists).

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7925 +7925 @@
     AutoMultiWriteLock2 alock (mParent, this);
 
+#ifdef VBOX_WITH_LIVE_MIGRATION
     AssertReturn(    (    !Global::IsOnlineOrTransient (mData->mMachineState)
                        || mData->mMachineState == MachineState_Paused
-#ifdef VBOX_WITH_LIVE_MIGRATION
                        || mData->mMachineState == MachineState_Running
-#endif
                      )
                   && mSnapshotData.mLastState == MachineState_Null
@@ -7935 +7934 @@
                   && mSnapshotData.mServerProgress.isNull()
                   && mSnapshotData.mCombinedProgress.isNull(), E_FAIL);
+#else
+    AssertReturn(    (    !Global::IsOnlineOrTransient (mData->mMachineState)
+                       || mData->mMachineState == MachineState_Paused
+                     )
+                  && mSnapshotData.mLastState == MachineState_Null
+                  && mSnapshotData.mSnapshot.isNull()
+                  && mSnapshotData.mServerProgress.isNull()
+                  && mSnapshotData.mCombinedProgress.isNull(), E_FAIL);
+#endif
 
     bool const fTakingSnapshotOnline = (   mData->mMachineState == MachineState_Running