added ACE_AUTO_PTR_RESET macro

1 files changed, 21 insertions, 0 deletions

diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 1fb575c8c12..ac4f2e69a66 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -123,6 +123,27 @@ public:
   X *operator-> () const;
 };
 
+// Some platforms have an older version of auto_ptr
+// support, which lacks reset, and cannot be disabled
+// easily.  Portability to these platforms requires
+// use of the following ACE_AUTO_PTR_RESET macro.
+# if defined (ACE_AUTO_PTR_LACKS_RESET)
+#   define ACE_AUTO_PTR_RESET(X,Y) \
+      do { \
+        if (Y != X.get ()) \
+          { \
+            X.release (); \
+            X = Y; \
+          } \
+      } while (0)
+# else /* ! ACE_AUTO_PTR_LACKS_RESET */
+#   define ACE_AUTO_PTR_RESET(X,Y) \
+      do { \
+         X.reset (Y); \
+      } while (0)
+# endif /* ACE_AUTO_PTR_LACKS_RESET */
+
+
 #if defined (__ACE_INLINE__)
 #include "ace/Auto_Ptr.i"
 #endif /* __ACE_INLINE__ */