respect review comment

DOCGroup · Aug 18, 2023 · 1288a1c · 1288a1c
1 parent bf556a0
commit 1288a1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h
@@ -69,13 +69,11 @@ class ACE_Auto_Basic_Ptr
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 // NOTE: ACE7 and TAO3 require C++11 support or newer; jwillemsen commented on Jun 1, 2021
-#if defined (ACE_LACKS_AUTO_PTR)
-#  undef ACE_LACKS_AUTO_PTR
-#endif
-
 #if !defined (ACE_LACKS_AUTO_PTR)
-#  include <memory>
-// NO! using std::unique_ptr;
+#  ifndef ACE_HAS_CPP17
+#    include <memory>
+using std::auto_ptr;
+#  endif
 #else /* !ACE_LACKS_AUTO_PTR */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <string>
+#include <memory>
 #include <typeinfo.h>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -44,8 +45,8 @@ class TAO_Notify_Tracker
   TAO_Notify_Tracker();
   ~TAO_Notify_Tracker();
 
-  friend class std::auto_ptr< TAO_Notify_Tracker >;
-  static std::auto_ptr< TAO_Notify_Tracker > s_instance;
+  friend class std::unique_ptr< TAO_Notify_Tracker >;
+  static std::unique_ptr< TAO_Notify_Tracker > s_instance;
   mutable TAO_SYNCH_MUTEX lock_;
   typedef std::map<int, Entry> EntityMap;
   EntityMap map_;
@@ -133,7 +134,7 @@ TAO_Notify_Refcountable::_decr_refcnt ()
 
 #if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
 
-std::auto_ptr< TAO_Notify_Tracker > TAO_Notify_Tracker::s_instance;
+std::unique_ptr< TAO_Notify_Tracker > TAO_Notify_Tracker::s_instance;
 
 TAO_Notify_Tracker::TAO_Notify_Tracker()
 : id_counter_(0)