Changeset 55594 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 2, 2015 3:54:10 AM (10 years ago)

Author:

vboxsync

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

99967

Message:

copy by assignment fix.

File:

• trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h (modified) (4 diffs)

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

@@ -363 +363 @@
     GuestEnvironmentBase(const GuestEnvironmentBase &rThat, bool fChangeRecord)
         : m_hEnv(NIL_RTENV)
+        , m_cRefs(1)
     {
         int rc = cloneCommon(rThat, fChangeRecord);
@@ -416 +417 @@
 };
 
+class GuestEnvironmentChanges;
+
 
 /**
@@ -471 +474 @@
         return cloneCommon(rThat, false /*fChangeRecord*/);
     }
+
+    /**
+     * @copydoc copy()
+     */
+    GuestEnvironment &operator=(const GuestEnvironmentBase &rThat)
+    {
+        int rc = cloneCommon(rThat, true /*fChangeRecord*/);
+        if (RT_FAILURE(rc))
+            throw (Global::vboxStatusCodeToCOM(rc));
+        return *this;
+    }
+
+    /** @copydoc copy() */
+    GuestEnvironment &operator=(const GuestEnvironment &rThat)
+    {   return operator=((const GuestEnvironmentBase &)rThat); }
+
+    /** @copydoc copy() */
+    GuestEnvironment &operator=(const GuestEnvironmentChanges &rThat)
+    {   return operator=((const GuestEnvironmentBase &)rThat); }
+
 };
 
@@ -531 +554 @@
         return cloneCommon(rThat, true /*fChangeRecord*/);
     }
+
+    /**
+     * @copydoc copy()
+     */
+    GuestEnvironmentChanges &operator=(const GuestEnvironmentBase &rThat)
+    {
+        int rc = cloneCommon(rThat, true /*fChangeRecord*/);
+        if (RT_FAILURE(rc))
+            throw (Global::vboxStatusCodeToCOM(rc));
+        return *this;
+    }
+
+    /** @copydoc copy() */
+    GuestEnvironmentChanges &operator=(const GuestEnvironmentChanges &rThat)
+    {   return operator=((const GuestEnvironmentBase &)rThat); }
+
+    /** @copydoc copy() */
+    GuestEnvironmentChanges &operator=(const GuestEnvironment &rThat)
+    {   return operator=((const GuestEnvironmentBase &)rThat); }
 };