Merge pull request #2324 from jwillemsen/jwi-depcopydisabled

Added deprecated attribute to ACE_Copy_Disabled
DOCGroup · Feb 5, 2025 · 0718af0 · 0718af0
2 parents a6a1599 + afe6592
commit 0718af0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/ACE/ace/Copy_Disabled.cpp b/ACE/ace/Copy_Disabled.cpp
diff --git a/ACE/ace/Copy_Disabled.h b/ACE/ace/Copy_Disabled.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "ace/ACE_export.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -42,12 +42,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * {
  * // code here
  * };
+ *
+ * @deprecated This class is deprecated. Instead of using inheritance,
+ * directly delete copy operations in your class:
+ *
+ * class Foo
+ * {
+ * public:
+ *   Foo(const Foo&) = delete;
+ *   Foo(Foo&&) = delete;
+ *   Foo& operator=(const Foo&) = delete;
+ *   Foo& operator=(Foo&&) = delete;
+ * };
  */
-class ACE_Export ACE_Copy_Disabled
+class [[deprecated]] ACE_Copy_Disabled
 {
 public:
   /// Default constructor
-  ACE_Copy_Disabled ();
+  ACE_Copy_Disabled () = default;
 
 private:
   ACE_Copy_Disabled (const ACE_Copy_Disabled &) = delete;

diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
@@ -44,7 +44,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Configuration_Import_Export.cpp
     Connection_Recycling_Strategy.cpp
     Containers.cpp
-    Copy_Disabled.cpp
     Date_Time.cpp
     DEV.cpp
     DEV_Addr.cpp
@@ -400,6 +399,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     CORBA_macros.h
     Codeset_Symbols.h
     Condition_T.h
+    Copy_Disabled.h
     Countdown_Time.h
     Default_Constants.h
     Event_Base.h

diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
@@ -37,7 +37,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Condition_Attributes.cpp
     Condition_Recursive_Thread_Mutex.cpp
     Condition_Thread_Mutex.cpp
-    Copy_Disabled.cpp
     DLL_Manager.cpp
     Dirent.cpp // Required by TAO_IDL
     Dirent_Selector.cpp
@@ -307,6 +306,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Bound_Ptr.h
     CORBA_macros.h
     Condition_T.h
+    Copy_Disabled.h
     Countdown_Time.h
     Default_Constants.h
     Event_Base.h