Merged revisions 81179 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE

........
  r81179 | iliyan | 2008-03-31 14:00:29 -0500 (Mon, 31 Mar 2008) | 1 line
  
  ChangeLogTag: Mon Mar 31 18:56:40 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........

4 files changed, 15 insertions, 46 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a5afac60154..66543c55c8a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,14 @@
+Mon Mar 31 18:56:40 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Refcounted_Auto_Ptr.h:
+        * ace/Refcounted_Auto_Ptr.inl:
+        * ace/Refcounted_Auto_Ptr.cpp:
+
+          Reverting the changes because a) they are not really necessary
+          for the refactoring of the service config, and; b) the AIX
+          compiler appears to not deal well with implicit conversion
+          definitions, to template member types.
+
 Mon Mar 31 16:15:17 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * tests/tests.mpc:
diff --git a/ACE/ace/Refcounted_Auto_Ptr.cpp b/ACE/ace/Refcounted_Auto_Ptr.cpp
index 78dd941b744..7dd9d862b64 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.cpp
+++ b/ACE/ace/Refcounted_Auto_Ptr.cpp
@@ -5,10 +5,6 @@
 
 #include "ace/Refcounted_Auto_Ptr.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Refcounted_Auto_Ptr.inl"
-#endif /* __ACE_INLINE __ */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class X, class ACE_LOCK>
diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h
index ae7db0727bb..46bd34c9d7a 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.h
+++ b/ACE/ace/Refcounted_Auto_Ptr.h
@@ -46,16 +46,6 @@ template <class X, class ACE_LOCK> class ACE_Refcounted_Auto_Ptr;
 template <class X, class ACE_LOCK>
 class ACE_Refcounted_Auto_Ptr
 {
-protected:
-  /// the ACE_Refcounted_Auto_Ptr_Rep
-  typedef ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> AUTO_REFCOUNTED_PTR_REP;
-
-  /// Used to define a proper boolean conversion
-  typedef ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> RAP;
-  static void unspecified_bool( RAP***){};
-  typedef void (*unspecified_bool_type)( RAP***);
-
-
 public:
 
   // = Initialization and termination methods.
@@ -69,13 +59,6 @@ public:
   /// An ACE_Refcounted_Auto_Ptr_Rep is created if necessary.
   ACE_Refcounted_Auto_Ptr (const ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &r);
 
-  // Boolean conversion
-  // never throws
-  operator unspecified_bool_type() const;
-
-  ACE_Refcounted_Auto_Ptr (ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *);
-  ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *rep() const;
-
   /// Destructor. Releases the reference to the underlying representation.
   /// If the release of that reference causes its reference count to reach 0,
   /// the representation object will also be destroyed.
@@ -121,7 +104,7 @@ public:
   /// Get the pointer value.
   X *get (void) const;
 
-   /// Get the reference count value.
+  /// Get the reference count value.
   long count (void) const;
 
   /// Returns @c true if this object does not contain a valid pointer.
@@ -131,6 +114,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
+  /// the ACE_Refcounted_Auto_Ptr_Rep
+  typedef ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> AUTO_REFCOUNTED_PTR_REP;
 
   /// Protect operations on the ACE_Refcounted_Auto_Ptr.
   AUTO_REFCOUNTED_PTR_REP *rep_;
@@ -191,7 +176,7 @@ private:
   /// Reference count.
   mutable ACE_Atomic_Op<ACE_LOCK, long> ref_count_;
 
-public:
+private:
   // = Constructor and destructor private.
   ACE_Refcounted_Auto_Ptr_Rep (X *p = 0);
   ~ACE_Refcounted_Auto_Ptr_Rep (void);
@@ -199,9 +184,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
 #include "ace/Refcounted_Auto_Ptr.inl"
-#endif /* __ACE_INLINE __ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Refcounted_Auto_Ptr.cpp"
diff --git a/ACE/ace/Refcounted_Auto_Ptr.inl b/ACE/ace/Refcounted_Auto_Ptr.inl
index 20f0af5aca4..a8412d2d3a2 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.inl
+++ b/ACE/ace/Refcounted_Auto_Ptr.inl
@@ -95,32 +95,11 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr (X *p)
 }
 
 template <class X, class ACE_LOCK> inline
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator typename ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::unspecified_bool_type () const
-{
-  return null() ? 0: unspecified_bool;
-}
-
-
-template <class X, class ACE_LOCK> inline
 ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr (const ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &r)
   : rep_ (AUTO_REFCOUNTED_PTR_REP::attach (((ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &) r).rep_))
 {
 }
 
-template <class X, class ACE_LOCK> inline
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr (ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>  *p)
-  : rep_ (AUTO_REFCOUNTED_PTR_REP::attach (p))
-{
-}
-
-template <class X, class ACE_LOCK> inline ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>*
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::rep (void) const
-{
-  return this->rep_;
-}
-
-
-
 template <class X, class ACE_LOCK> inline bool
 ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator== (const ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &r) const
 {