Changeset 28587 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 22, 2010 11:38:59 AM (15 years ago)

Author:

vboxsync

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

60425

Message:

Main/Medium: fix parameter passing for mergeTo(), eliminating unnecessary indirection and copying.

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (1 diff)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -4489 +4489 @@
  */
 HRESULT Medium::mergeTo(const ComObjPtr<Medium> &pTarget,
-                        bool &fMergeForward,
-                        ComObjPtr<Medium> pParentForTarget,
+                        bool fMergeForward,
+                        const ComObjPtr<Medium> &pParentForTarget,
                         const MediaList &aChildrenToReparent,
                         MediumLockList *aMediumLockList,

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

@@ -211 +211 @@
                            MediumLockList * &aMediumLockList);
     HRESULT mergeTo(const ComObjPtr<Medium> &pTarget,
-                    bool &fMergeForward,
-                    ComObjPtr<Medium> pParentForTarget,
+                    bool fMergeForward,
+                    const ComObjPtr<Medium> &pParentForTarget,
                     const MediaList &aChildrenToReparent,
                     MediumLockList *aMediumLockList,