When we have C++11 ACE_Strong_Bound_Ptr doesn't provide std::auto_ptr support, that is deprecated

    * ACE/ace/Bound_Ptr.h:
    * ACE/ace/Bound_Ptr.inl:
    * ACE/tests/Bound_Ptr_Test.cpp:

1 files changed, 7 insertions, 1 deletions

diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index 46123c1ee43..4d07c5417d9 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -20,7 +20,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Auto_Ptr.h"
+#if !defined (ACE_HAS_CPP11)
+# include "ace/Auto_Ptr.h"
+#endif /* !ACE_HAS_CPP11 */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -114,9 +116,11 @@ public:
   /// object \<p\> immediately.
   explicit ACE_Strong_Bound_Ptr (X *p = 0);
 
+#if !defined (ACE_HAS_CPP11)
   /// Constructor that initializes an ACE_Strong_Bound_Ptr by stealing
   /// ownership of an object from an auto_ptr.
   explicit ACE_Strong_Bound_Ptr (auto_ptr<X> p);
+#endif /* !ACE_HAS_CPP11 */
 
   /// Copy constructor binds @c this and @a r to the same object.
   ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r);
@@ -214,10 +218,12 @@ public:
   /// underlying object.
   void reset (X *p = 0);
 
+#if !defined (ACE_HAS_CPP11)
   /// Resets the ACE_Strong_Bound_Ptr to refer to a different
   /// underlying object, ownership of which is stolen from the
   /// auto_ptr.
   void reset (auto_ptr<X> p);
+#endif /* !ACE_HAS_CPP11 */
 
   /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr
   /// objects.