Changeset 106515 in vbox for trunk/src/VBox/Main/include/ovfreader.h

Timestamp:

Oct 20, 2024 2:00:07 AM (3 months ago)

Author:

vboxsync

Message:

Main/ovfreader.h: Tried to fix botched copy constructor suppression in HardwareItemVector only to find that it is required for a default (empty) VirtualSystem() instance that gets push_back() onto some list. So, added a restricted copy constructor that asserts if the list isn't empty. Untested! jiraref:VBP-1171

File:

• trunk/src/VBox/Main/include/ovfreader.h (modified) (3 diffs)

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

@@ -532 +532 @@
     RTCString itemName;
 
-    virtual const RTCString& _getItemName()
+    virtual const RTCString &_getItemName()
     {
         return itemName;
@@ -560 +560 @@
     }
 
-    /* There is no copying of this vector.  We'd need something like shared_ptr for that. */
+    /* We only support copying if the vector is empty, we'd need something like
+       shared_ptr for dealing with a populated list. (Problem found by VS 2022.) */
+    HardwareItemVector(const HardwareItemVector &a_rThat)
+        : std::vector<VirtualHardwareItem *>()
+    {
+        Assert(a_rThat.begin() == a_rThat.end());
+    }
+
 private:
-    HardwareItemVector(const VirtualSystem &);
-
+#if RT_CPLUSPLUS_PREREQ(201100) /* VC2022: No copy assignment operator (see copy constructor). */
+    HardwareItemVector &operator=(const HardwareItemVector &) = delete;
+#else
+    HardwareItemVector &operator=(const HardwareItemVector &);
+#endif
 };
 
@@ -667 +677 @@
 
     VirtualSystem()
-        : cimos(CIMOSType_CIMOS_Unknown),
-          ullMemorySize(0),
-          cCPUs(1),
-          fHasFloppyDrive(false),
-          fHasCdromDrive(false),
-          fHasUsbController(false),
-          pelmVBoxMachine(NULL)
-    {
-    }
+        : cimos(CIMOSType_CIMOS_Unknown)
+        , ullMemorySize(0)
+        , cCPUs(1)
+        , fHasFloppyDrive(false)
+        , fHasCdromDrive(false)
+        , fHasUsbController(false)
+        , pelmVBoxMachine(NULL)
+    {
+    }
+
+#if RT_CPLUSPLUS_PREREQ(201100) /* VC2022: Excplit default copy constructor and copy assignment operator to avoid warnings. */
+    /* Note! HardwareItemVector only allow copying if it's empty. */
+    VirtualSystem(VirtualSystem const &) = default;
+    VirtualSystem &operator=(VirtualSystem const &) = delete;
+#endif
 };