Changeset 26171 in vbox for trunk/src/VBox/Main/MediumAttachmentImpl.cpp

Timestamp:

Feb 2, 2010 8:37:36 PM (15 years ago)

Author:

vboxsync

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

57185

Message:

Main: get rid of Backupable<>::hasActualChanges and the operator== in all the machine data structures which it required; nuke obsolete Shareable.h

File:

• trunk/src/VBox/Main/MediumAttachmentImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -44 +44 @@
     { }
 
-    bool operator==(const BackupableMediumAttachmentData &that) const
-    {
-        return    this == &that
-               || (fPassthrough == that.fPassthrough);
-    }
-
     ComObjPtr<Medium>   pMedium;
     /* Since MediumAttachment is not a first class citizen when it
@@ -282 +276 @@
  *  @note Locks this object for writing.
  */
-bool MediumAttachment::rollback()
+void MediumAttachment::rollback()
 {
     LogFlowThisFunc(("ENTER - %s\n", getLogName()));
@@ -288 +282 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), false);
+    AssertComRCReturnVoid(autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    bool changed = false;
-
-    if (m->bd.isBackedUp())
-    {
-        /* we need to check all data to see whether anything will be changed
-         * after rollback */
-        changed = m->bd.hasActualChanges();
-        m->bd.rollback();
-    }
-
-    LogFlowThisFunc(("LEAVE - %s - returning %RTbool\n", getLogName(), changed));
-    return changed;
+    m->bd.rollback();
+
+    LogFlowThisFunc(("LEAVE - %s\n", getLogName()));
 }