Changeset 81674 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2019 2:44:22 PM (5 years ago)

Author:

vboxsync

Message:

Main: Fixes for deprecated implicit copy operators (GCC 9).

Location:

trunk/src/VBox/Main

Files:

• include/AudioDriver.h (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src-client/AudioDriver.cpp (modified) (1 diff)

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

@@ -40 +40 @@
         , strName(a_strName) { }
 
-    AudioDriverCfg& operator=(AudioDriverCfg that)
+    /** Copy assignment operator. */
+    AudioDriverCfg& operator=(AudioDriverCfg const &a_rThat) RT_NOEXCEPT
     {
-        this->strDev  = that.strDev;
-        this->uInst   = that.uInst;
-        this->uLUN    = that.uLUN;
-        this->strName = that.strName;
+        this->strDev  = a_rThat.strDev;
+        this->uInst   = a_rThat.uInst;
+        this->uLUN    = a_rThat.uLUN;
+        this->strName = a_rThat.strName;
 
         return *this;
@@ -72 +73 @@
     AudioDriver(Console *pConsole);
     virtual ~AudioDriver();
+
+    /** Copy assignment operator. */
+    AudioDriver &operator=(AudioDriver const &a_rThat) RT_NOEXCEPT;
 
     Console *GetParent(void) { return mpConsole; }

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

@@ -580 +580 @@
         { }
 
-        // copy constructor
+        /** Copy constructor. */
         SharedFolderData(const SharedFolderData& aThat)
             : m_strHostPath(aThat.m_strHostPath)
@@ -587 +587 @@
             , m_strAutoMountPoint(aThat.m_strAutoMountPoint)
         { }
+
+        /** Copy assignment operator. */
+        SharedFolderData &operator=(SharedFolderData const &a_rThat) RT_NOEXCEPT
+        {
+            m_strHostPath       = a_rThat.m_strHostPath;
+            m_fWritable         = a_rThat.m_fWritable;
+            m_fAutoMount        = a_rThat.m_fAutoMount;
+            m_strAutoMountPoint = a_rThat.m_strAutoMountPoint;
+
+            return *this;
+        }
 
         Utf8Str m_strHostPath;

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

@@ -765 +765 @@
            : mValue(aThat.mValue) { }
 
+    /** Copy assignment operator. */
+    GuestProcessStreamValue &operator=(GuestProcessStreamValue const &a_rThat) RT_NOEXCEPT
+    {
+        mValue = a_rThat.mValue;
+
+        return *this;
+    }
+
     Utf8Str mValue;
 };

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

@@ -38 +38 @@
 }
 
+
 AudioDriver::~AudioDriver(void)
 {
+}
+
+
+AudioDriver &AudioDriver::operator=(AudioDriver const &a_rThat) RT_NOEXCEPT
+{
+    mpConsole  = a_rThat.mpConsole;
+    mCfg       = a_rThat.mCfg;
+    mfAttached = a_rThat.mfAttached;
+
+    return *this;
 }