Changeset 106498 in vbox

Timestamp:

Oct 19, 2024 3:12:39 AM (4 months ago)

Author:

vboxsync

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

165330

Message:

iprt/rest: Shut up some complains about default copy assignment operator. jiraref:VBP-1171

Location:

trunk

Files:

• include/iprt/cpp/restbase.h (modified) (2 diffs)
• include/iprt/cpp/restoutput.h (modified) (4 diffs)
• src/VBox/Runtime/VBox/VBoxRTImp-vcc-arm64.def (modified) (2 diffs)
• src/VBox/Runtime/VBox/VBoxRTImp-vcc64.def (modified) (2 diffs)
• src/VBox/Runtime/common/rest/RTCRestOutputBase.cpp (modified) (1 diff)
• src/VBox/Runtime/common/rest/RTCRestOutputPrettyBase.cpp (modified) (1 diff)

trunk/include/iprt/cpp/restbase.h

@@ -95 +95 @@
         }
     }
+
+#if RT_CPLUSPLUS_PREREQ(201100)
+    RTCRestJsonCursor &operator=(struct RTCRestJsonCursor const &a_rThat) = delete;
+#endif
 };
 
@@ -148 +152 @@
      */
     virtual char *getPath(RTCRestJsonCursor const &a_rCursor, char *a_pszDst, size_t a_cbDst) const RT_NOEXCEPT;
+
+#if RT_CPLUSPLUS_PREREQ(201100)
+    RTCRestJsonPrimaryCursor &operator=(RTCRestJsonPrimaryCursor const &a_rThat) = delete;
+#endif
 };
 

trunk/include/iprt/cpp/restoutput.h

@@ -60 +60 @@
     RTCRestOutputBase() RT_NOEXCEPT;
     virtual ~RTCRestOutputBase();
+
+    RTCRestOutputBase(const RTCRestOutputBase &a_rThat) RT_NOEXCEPT;
+    RTCRestOutputBase &operator=(const RTCRestOutputBase &a_rThat) RT_NOEXCEPT;
 
     /**
@@ -151 +154 @@
     virtual ~RTCRestOutputPrettyBase();
 
+    RTCRestOutputPrettyBase(const RTCRestOutputPrettyBase &a_rThat) RT_NOEXCEPT;
+    RTCRestOutputPrettyBase &operator=(const RTCRestOutputPrettyBase &a_rThat) RT_NOEXCEPT;
+
     /**
      * Begins an array.
@@ -228 +234 @@
 
     /* Make non-copyable (RTCNonCopyable causes warnings): */
+#if RT_CPLUSPLUS_PREREQ(201100)
+    RTCRestOutputToString(RTCRestOutputToString const &) = delete;
+    RTCRestOutputToString *operator=(RTCRestOutputToString const &) = delete;
+#else
     RTCRestOutputToString(RTCRestOutputToString const &);
     RTCRestOutputToString *operator=(RTCRestOutputToString const &);
+#endif
 };
 
@@ -269 +280 @@
 
     /* Make non-copyable (RTCNonCopyable causes warnings): */
+#if RT_CPLUSPLUS_PREREQ(201100)
+    RTCRestOutputPrettyToString(RTCRestOutputToString const &) = delete;
+    RTCRestOutputPrettyToString *operator=(RTCRestOutputToString const &) = delete;
+#else
     RTCRestOutputPrettyToString(RTCRestOutputToString const &);
     RTCRestOutputPrettyToString *operator=(RTCRestOutputToString const &);
+#endif
 };
 

trunk/src/VBox/Runtime/VBox/VBoxRTImp-vcc-arm64.def

@@ -121 +121 @@
     ??0RTCRestOutputPrettyBase@@QEAA@AEBV0@@Z                                   ; (public: __cdecl RTCRestOutputPrettyBase::RTCRestOutputPrettyBase(class RTCRestOutputPrettyBase const &))
     ??0RTCRestOutputPrettyBase@@QEAA@XZ                                         ; (public: __cdecl RTCRestOutputPrettyBase::RTCRestOutputPrettyBase(void))
-    ??0RTCRestOutputPrettyToString@@QEAA@AEBV0@@Z                               ; (public: __cdecl RTCRestOutputPrettyToString::RTCRestOutputPrettyToString(class RTCRestOutputPrettyToString const &))
     ??0RTCRestOutputPrettyToString@@QEAA@PEAVRTCString@@_N@Z                    ; (public: __cdecl RTCRestOutputPrettyToString::RTCRestOutputPrettyToString(class RTCString *,bool))
     ??0RTCRestOutputToString@@QEAA@PEAVRTCString@@_N@Z                          ; (public: __cdecl RTCRestOutputToString::RTCRestOutputToString(class RTCString *,bool))
@@ -177 +176 @@
     ??4RTCRestInt32@@QEAAAEAV0@AEBV0@@Z                                         ; (public: class RTCRestInt32 & __cdecl RTCRestInt32::operator=(class RTCRestInt32 const &))
     ??4RTCRestInt64@@QEAAAEAV0@AEBV0@@Z                                         ; (public: class RTCRestInt64 & __cdecl RTCRestInt64::operator=(class RTCRestInt64 const &))
-    ??4RTCRestJsonCursor@@QEAAAEAU0@AEBU0@@Z                                    ; (public: struct RTCRestJsonCursor & __cdecl RTCRestJsonCursor::operator=(struct RTCRestJsonCursor const &))
-    ??4RTCRestJsonPrimaryCursor@@QEAAAEAV0@AEBV0@@Z                             ; (public: class RTCRestJsonPrimaryCursor & __cdecl RTCRestJsonPrimaryCursor::operator=(class RTCRestJsonPrimaryCursor const &))
     ??4RTCRestObjectBase@@QEAAAEAV0@AEBV0@@Z                                    ; (public: class RTCRestObjectBase & __cdecl RTCRestObjectBase::operator=(class RTCRestObjectBase const &))
     ??4RTCRestOutputBase@@QEAAAEAV0@AEBV0@@Z                                    ; (public: class RTCRestOutputBase & __cdecl RTCRestOutputBase::operator=(class RTCRestOutputBase const &))

trunk/src/VBox/Runtime/VBox/VBoxRTImp-vcc64.def

@@ -121 +121 @@
     ??0RTCRestOutputPrettyBase@@QEAA@AEBV0@@Z                                   ; (public: __cdecl RTCRestOutputPrettyBase::RTCRestOutputPrettyBase(class RTCRestOutputPrettyBase const &))
     ??0RTCRestOutputPrettyBase@@QEAA@XZ                                         ; (public: __cdecl RTCRestOutputPrettyBase::RTCRestOutputPrettyBase(void))
-    ??0RTCRestOutputPrettyToString@@QEAA@AEBV0@@Z                               ; (public: __cdecl RTCRestOutputPrettyToString::RTCRestOutputPrettyToString(class RTCRestOutputPrettyToString const &))
     ??0RTCRestOutputPrettyToString@@QEAA@PEAVRTCString@@_N@Z                    ; (public: __cdecl RTCRestOutputPrettyToString::RTCRestOutputPrettyToString(class RTCString *,bool))
     ??0RTCRestOutputToString@@QEAA@PEAVRTCString@@_N@Z                          ; (public: __cdecl RTCRestOutputToString::RTCRestOutputToString(class RTCString *,bool))
@@ -177 +176 @@
     ??4RTCRestInt32@@QEAAAEAV0@AEBV0@@Z                                         ; (public: class RTCRestInt32 & __cdecl RTCRestInt32::operator=(class RTCRestInt32 const &))
     ??4RTCRestInt64@@QEAAAEAV0@AEBV0@@Z                                         ; (public: class RTCRestInt64 & __cdecl RTCRestInt64::operator=(class RTCRestInt64 const &))
-    ??4RTCRestJsonCursor@@QEAAAEAU0@AEBU0@@Z                                    ; (public: struct RTCRestJsonCursor & __cdecl RTCRestJsonCursor::operator=(struct RTCRestJsonCursor const &))
-    ??4RTCRestJsonPrimaryCursor@@QEAAAEAV0@AEBV0@@Z                             ; (public: class RTCRestJsonPrimaryCursor & __cdecl RTCRestJsonPrimaryCursor::operator=(class RTCRestJsonPrimaryCursor const &))
     ??4RTCRestObjectBase@@QEAAAEAV0@AEBV0@@Z                                    ; (public: class RTCRestObjectBase & __cdecl RTCRestObjectBase::operator=(class RTCRestObjectBase const &))
     ??4RTCRestOutputBase@@QEAAAEAV0@AEBV0@@Z                                    ; (public: class RTCRestOutputBase & __cdecl RTCRestOutputBase::operator=(class RTCRestOutputBase const &))

trunk/src/VBox/Runtime/common/rest/RTCRestOutputBase.cpp

@@ -54 +54 @@
 RTCRestOutputBase::~RTCRestOutputBase()
 {
+}
+
+
+RTCRestOutputBase::RTCRestOutputBase(RTCRestOutputBase const &a_rThat) RT_NOEXCEPT
+    : m_uState(a_rThat.m_uState)
+{
+}
+
+
+RTCRestOutputBase &RTCRestOutputBase::operator=(RTCRestOutputBase const &a_rThat) RT_NOEXCEPT
+{
+    m_uState = a_rThat.m_uState;
+    return *this;
 }
 

trunk/src/VBox/Runtime/common/rest/RTCRestOutputPrettyBase.cpp

@@ -54 +54 @@
 RTCRestOutputPrettyBase::~RTCRestOutputPrettyBase()
 {
+}
+
+
+RTCRestOutputPrettyBase::RTCRestOutputPrettyBase(const RTCRestOutputPrettyBase &a_rThat) RT_NOEXCEPT
+    : RTCRestOutputBase(a_rThat)
+{
+}
+
+
+RTCRestOutputPrettyBase &RTCRestOutputPrettyBase::operator=(const RTCRestOutputPrettyBase &a_rThat) RT_NOEXCEPT
+{
+    RTCRestOutputBase::operator=(a_rThat);
+    return *this;
 }