This commit was manufactured by cvs2svn to create tagami_phase4_end

'ami_phase4_end'.

139 files changed, 3792 insertions, 11609 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index c42a654c78d..0c6921c5b74 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -30,29 +30,6 @@ size_t ACE::pagesize_ = 0;
 // Size of allocation granularity.
 size_t ACE::allocation_granularity_ = 0;
 
-int
-ACE::out_of_handles (int error)
-{
-  // EMFILE is common to all platforms.
-  if (error == EMFILE ||
-#if defined (ACE_WIN32)
-      // On Win32, we need to check for ENOBUFS also.
-      error == ENOBUFS ||
-#elif defined (HPUX)
-      // On HPUX, we need to check for EADDRNOTAVAIL also.
-      error == EADDRNOTAVAIL ||
-#elif defined (linux)
-      // On linux, we need to check for ENOENT also.
-      error == ENOENT ||
-#elif defined (sun)
-      // On sun, we need to check for ENOSR also.
-      error == ENOSR ||
-#endif /* ACE_WIN32 */
-      error == ENFILE)
-    return 1;
-  else
-    return 0;
-}
 
 int
 ACE::init (void)
@@ -252,7 +229,7 @@ ACE::strsplit_r (char *str,
 const char *
 ACE::execname (const char *old_name)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32)
   if (ACE_OS::strstr (old_name, ".exe") == 0)
     {
       char *new_name;
@@ -264,7 +241,7 @@ ACE::execname (const char *old_name)
 
       ACE_NEW_RETURN (new_name,
                       char[size],
-                      0);
+                      -1);
       char *end = new_name;
 
       end = ACE_OS::strecpy (new_name, old_name);
@@ -274,7 +251,7 @@ ACE::execname (const char *old_name)
 
       return new_name;
     }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
   return old_name;
 }
 
@@ -332,7 +309,7 @@ ACE::strsplit_r (wchar_t *str,
 const wchar_t *
 ACE::execname (const wchar_t *old_name)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32)
   if (ACE_OS::strstr (old_name, L".exe") == 0)
     {
       wchar_t *new_name;
@@ -344,7 +321,7 @@ ACE::execname (const wchar_t *old_name)
 
       ACE_NEW_RETURN (new_name,
                       wchar_t[size],
-                      0);
+                      -1);
       wchar_t *end = new_name;
 
       end = ACE_OS::strecpy (new_name, old_name);
@@ -354,7 +331,7 @@ ACE::execname (const wchar_t *old_name)
 
       return new_name;
     }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
   return old_name;
 }
 #endif /* ACE_HAS_UNICODE */
@@ -1692,7 +1669,7 @@ ACE::timestamp (ASYS_TCHAR date_and_time[], int date_and_timelen)
                    timebuf,
                    date_and_timelen);
   ACE_OS::sprintf (&date_and_time[19],
-                   ".%06ld",
+                   ".%06d",
                    cur_time.usec ());
 #endif /* WIN32 */
   date_and_time[26] = '\0';
@@ -2851,6 +2828,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
         {
           ACE_UINT64 haddr;  // a place to put the address
           char * haddrp = (char *) &haddr;  // convert to char pointer
+          haddr += 4;   // adjust within the word
           ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length);
           ip_addr.sin_addr.s_addr = haddr;
         }
@@ -3220,7 +3198,7 @@ ACE::get_ip_interfaces (size_t &count,
       // Ethernet.
       ACE_OS::sprintf (dev_name,
                        "ether%d",
-                       i);
+                       i);    
       ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
       if (ip_dev[count] == 0)
         break;
@@ -3230,7 +3208,7 @@ ACE::get_ip_interfaces (size_t &count,
       // SLIP.
       ACE_OS::sprintf (dev_name,
                        "sl%d",
-                       i);
+                       i); 
       ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
       if (ip_dev[count] == 0)
         break;
diff --git a/ace/ACE.h b/ace/ACE.h
index 88b74211d55..7ff95db5d77 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -72,10 +72,6 @@ public:
   static u_int compiler_beta_version (void);
   // E.g., the "0" in SunPro C++ 4.32.0
 
-  static int out_of_handles (int error);
-  // Check if error indicates the process being out of handles (file
-  // descriptors).
-
   // = Recv operations that factor out differences between Win32 and UNIX.
   static ssize_t recv (ACE_HANDLE handle,
                        void *buf,
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 49cd1b525e5..440987e7e41 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -422,18 +422,16 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump ();
   this->creation_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_));
   this->accept_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_));
   this->concurrency_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_));
   this->scheduling_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_name_ = %s"),
-              this->service_name_ == 0 ? ASYS_TEXT ("<unknown>") : this->service_name_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_description_ = %s"),
-              this->service_description_ == 0 ? ASYS_TEXT ("<unknown>") : this->service_description_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_port_ = %d"), this->service_port_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nservice_name_ = %s"), this->service_name_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nservice_description_ = %s"), this->service_description_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nservice_port_ = %d"), this->service_port_));
   this->service_addr_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -567,8 +565,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
       scheduling_strategy_ (0),
       delete_scheduling_strategy_ (0),
       service_name_ (0),
-      service_description_ (0),
-      service_port_ (0)
+      service_description_ (0)
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
 
@@ -592,17 +589,6 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
    const ASYS_TCHAR service_name[],
    const ASYS_TCHAR service_description[],
    int use_select)
-    : creation_strategy_ (0),
-      delete_creation_strategy_ (0),
-      accept_strategy_ (0),
-      delete_accept_strategy_ (0),
-      concurrency_strategy_ (0),
-      delete_concurrency_strategy_ (0),
-      scheduling_strategy_ (0),
-      delete_scheduling_strategy_ (0),
-      service_name_ (0),
-      service_description_ (0),
-      service_port_ (0)
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
 
@@ -749,13 +735,9 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ASYS_TCHAR **strp
   // @@ Should add the protocol in...
   ACE_OS::sprintf (buf,
                    ASYS_TEXT ("%s\t %s #%s\n"),
-                   this->service_name_ == 0 
-                   ? ASYS_TEXT ("<unknown>")
-                   : this->service_name_,
+                   this->service_name_,
                    service_addr_str,
-                   this->service_description_ == 0 
-                   ? ASYS_TEXT ("<unknown>")
-                   : this->service_description_);
+                   this->service_description_);
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
index 4d743d0530e..f4f88c1f1d3 100644
--- a/ace/Based_Pointer_Repository.h
+++ b/ace/Based_Pointer_Repository.h
@@ -18,8 +18,6 @@
 #ifndef ACE_BASED_POINTER_REPOSITORY_H
 #define ACE_BASED_POINTER_REPOSITORY_H
 
-#include "ace/OS.h"                  // Need ACE_Export
-
 // Forward decl., using the "Cheshire Cat" technique.
 class ACE_Based_Pointer_Repository_Rep;
 
diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp
index 0e97efcee87..5c993b8855f 100644
--- a/ace/Based_Pointer_T.cpp
+++ b/ace/Based_Pointer_T.cpp
@@ -7,44 +7,24 @@
 #include "ace/Based_Pointer_T.h"
 #include "ace/Based_Pointer_Repository.h"
 
-#   define ACE_TRACEX(X) ACE_Trace ____ (ASYS_TEXT (X), __LINE__, ASYS_TEXT (__FILE__))
-// #   define ACE_TRACEX(X)
-
-// #if !defined (__ACE_INLINE__)
+#if !defined (__ACE_INLINE__)
 #include "ace/Based_Pointer_T.i"
-// #endif /* __ACE_INLINE__ */
-
-template <class CONCRETE> ACE_INLINE
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
-{
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer");
-}
-
-template <class CONCRETE> void
-ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const
-{
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::dump");
+#endif /* __ACE_INLINE__ */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntarget_ = %d\n"), this->target_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base_offset_ = %d\n"), this->base_offset_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this))));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-template <class CONCRETE>
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (CONCRETE *initial)
-  : ACE_Based_Pointer_Basic<CONCRETE> (initial)
+template <class CONCRETE> ACE_Based_Pointer<CONCRETE> 
+operator+ (const ACE_Based_Pointer<CONCRETE> &lhs, long increment)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
+  // Perform pointer arithmetic.
+  CONCRETE *ptr = ((CONCRETE *) ACE_COMPUTE_BASED_POINTER (&lhs)) + increment;
+  ACE_Based_Pointer<CONCRETE> tmp (ptr);
+  return tmp;
 }
 
 template <class CONCRETE>
-ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (void)
+ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
   : target_ (0),
     base_offset_ (0)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
   void *base_addr = 0;
 
   // Find the base address associated with our <this> pointer.  Note
@@ -53,51 +33,22 @@ ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (void)
   ACE_BASED_POINTER_REPOSITORY::instance ()->find (this, 
                                                    base_addr);
   this->base_offset_ = (char *) this - (char *) base_addr;
-    this->dump ();
 }
 
 template <class CONCRETE>
-ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (CONCRETE *rhs)
+ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (CONCRETE *addr)
   : target_ (0),
     base_offset_ (0)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
   void *base_addr = 0;
 
   // Find the base address associated with the <addr> pointer.  Note
   // that it's ok for <find> to return 0, which simply indicates that
   // the address is not in memory-mapped virtual address space.
-  ACE_BASED_POINTER_REPOSITORY::instance ()->find (this,
+  ACE_BASED_POINTER_REPOSITORY::instance ()->find (addr,
                                                    base_addr);
-  this->base_offset_ = (char *) this - (char *) base_addr;
-  this->target_ = ((char *) rhs - (char *) base_addr);
-    this->dump ();
-}
-
-template <class CONCRETE> ACE_INLINE
-ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic<CONCRETE> &rhs)
-{
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
-
-  ACE_ASSERT (!"not implemented");
-  void *base_addr = 0;
-
-  // Find the base address associated with the <addr> pointer.  Note
-  // that it's ok for <find> to return 0, which simply indicates that
-  // the address is not in memory-mapped virtual address space.
-  ACE_BASED_POINTER_REPOSITORY::instance ()->find (this,
-                                                   base_addr);
-  this->base_offset_ = (char *) this - (char *) base_addr;
-  this->target_ = ((char *) &rhs - (char *) base_addr);
-    this->dump ();
-}
-
-template <class CONCRETE> ACE_INLINE
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &rhs)
-  : ACE_Based_Pointer_Basic<CONCRETE> (rhs)
-{
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer");
-  ACE_ASSERT (!"not implemented");
+  this->base_offset_ = (char *) addr - (char *) base_addr;
 }
 
 #endif/* ACE_BASED_POINTER_T_CPP */
+
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
index 0753b1980e5..0003bce08e8 100644
--- a/ace/Based_Pointer_T.h
+++ b/ace/Based_Pointer_T.h
@@ -18,8 +18,6 @@
 #ifndef ACE_BASED_POINTER_T_H
 #define ACE_BASED_POINTER_T_H
 
-#include "ace/OS.h"              // Need ACE_Export
-
 #if defined (_MSC_VER)
 // Suppress warning e.g. "return type for
 // 'ACE_Based_Pointer<long>::operator ->' is 'long *' (i.e., not a UDT
@@ -29,19 +27,21 @@
 #endif /* _MSC_VER */
 
 template <class CONCRETE> 
-class ACE_Based_Pointer_Basic
+class ACE_Based_Pointer
 {
   // = TITLE
   //   A proxy that keeps track of the relative offset of a "pointer"
   //   from its base address. 
   //
+  // = DESCRIPTION
   //   This class makes it possible to transparently use "pointers" in
   //   shared memory as easily as programming with pointers to local
   //   memory.  In particular, we don't need to ensure that the base
   //   addresses of all the pointers are mapped into separate
   //   processes at the same absolute memory base address.
 public:
-  ACE_Based_Pointer_Basic (void);
+  // = Initialization method.
+  ACE_Based_Pointer (void);
   // This constructor initializes the <base_offset_> by asking the
   // <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of
   // the memory region within which it is instantiated.  Two results
@@ -58,49 +58,37 @@ public:
   //    based-pointer uses its address as an offset to it's base
   //    address 0.
 
-  ACE_Based_Pointer_Basic (CONCRETE *initial);
-  // Initialize this object using the <initial> pointer.  This
-  // constructor initializes the <base_offset_> by asking the
-  // <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of
-  // the memory region within which it is instantiated.  Two results
-  // are possible:
-  // 
-  // 1. An <ACE_*_Memory_Pool> has stored a base address/size pair and the
-  //    new based-pointer instance is located between the base address and
-  //    the base address + size - 1.  In this case, the repository
-  //    returns the base address.
-  //
-  // 2. No suitable address/size pair was found.  The repository
-  //    assumes an address in the regular (not mapped) virtual address
-  //    space of the process and returns 0.  In this case, the
-  //    based-pointer uses its address as an offset to it's base
-  //    address 0.
+  ACE_Based_Pointer (CONCRETE *initial);
+  // Initialize this object with the <initial> pointer.
 
-  ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic<CONCRETE> &);
+  ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &rhs);
   // Copy constructor.
 
-  void operator = (CONCRETE *from);
+  CONCRETE *operator->(void);
+  // The C++ "delegation operator".
+
+  CONCRETE *operator =(CONCRETE *from);
   // Pseudo-assignment operator.
 
-  CONCRETE operator * (void) const;
+  CONCRETE operator *(void) const;
   // Dereference operator.
 
-  int operator < (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator < (const ACE_Based_Pointer<CONCRETE> &) const;
   // Less than operator.
 
-  int operator <= (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator <= (const ACE_Based_Pointer<CONCRETE> &) const;
   // Less than or equal operator.
 
-  int operator > (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator > (const ACE_Based_Pointer<CONCRETE> &) const;
   // Greater than operator.
 
-  int operator >= (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator >= (const ACE_Based_Pointer<CONCRETE> &) const;
   // Greater than or equal operator.
 
-  int operator == (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator == (const ACE_Based_Pointer<CONCRETE> &) const;
   // Equality operator.
 
-  int operator != (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator != (const ACE_Based_Pointer<CONCRETE> &) const;
   // Inequality operator.
 
   CONCRETE operator [](long index) const;
@@ -109,63 +97,26 @@ public:
   void operator+= (long index);
   // Increment operator.
 
-  CONCRETE *addr (void) const;
+  operator void *() const;
   // Returns the underlying memory address of the smart pointer.
 
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  void dump (void) const;
-  // Dump the state of the object.
-
   // The following should be private, but that causes problems due to
   // broken C++ compilers that don't like friends for methods
   // in templates.
-protected:
-  long target_;
+// private:
+  CONCRETE *target_;
 
   long base_offset_;
   // Keep track of our offset from the base pointer.
-
-  // = Prevent assignment and initialization (for now).
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Based_Pointer_Basic<CONCRETE> &))
 };
 
-template <class CONCRETE> 
-class ACE_Based_Pointer : public ACE_Based_Pointer_Basic<CONCRETE>
-{
-  // = TITLE
-  //   A smart proxy that keeps track of the relative offset of a
-  //   "pointer" from its base address.
-  //
-  // = DESCRIPTION
-  //   This class makes it possible to transparently use "pointers" in
-  //   shared memory as easily as programming with pointers to local
-  //   memory by overloading the C++ delegation operator ->().
-public:
-  // = Initialization method.
-  ACE_Based_Pointer (void);
-  // Constructor.  See constructor for <ACE_Based_Pointer_Basic> for
-  // details.
-
-  ACE_Based_Pointer (CONCRETE *initial);
-  // Initialize this object using the <initial> pointer.  
-
-  ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &);
-  // Copy constructor.
-
-  void operator = (CONCRETE *from);
-  // Pseudo-assignment operator.
-
-  CONCRETE *operator-> (void);
-  // The C++ "delegation operator".
-
-  // = Prevent assignment and initialization (for now).
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Based_Pointer<CONCRETE> &))
-};
+ACE_Export template <class CONCRETE> 
+ACE_Based_Pointer<CONCRETE> operator+ (const ACE_Based_Pointer<CONCRETE> &lhs,
+                                       long increment);
+// Emulate "pointer arithmetic" by adding <increment> to <lhs>.
 
 #if defined (__ACE_INLINE__)
-// #include "ace/Based_Pointer_T.i"
+#include "ace/Based_Pointer_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Based_Pointer_T.i b/ace/Based_Pointer_T.i
index c37d3a894d9..cb0a3ae5fea 100644
--- a/ace/Based_Pointer_T.i
+++ b/ace/Based_Pointer_T.i
@@ -1,116 +1,86 @@
 /* -*- C++ -*- */
 // $Id$
 
-#define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (P)->target_)
+#define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (long) (P)->target_)
 
-template <class CONCRETE> ACE_INLINE CONCRETE *
-ACE_Based_Pointer<CONCRETE>::operator->(void)
+template <class CONCRETE> ACE_INLINE
+ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &lhs)
+  : target_ (lhs.target_),
+    base_offset_ (lhs.base_offset_)
 {
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::operator->");
-    this->dump ();
-  return (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this));
 }
 
-template <class CONCRETE> ACE_INLINE void
-ACE_Based_Pointer_Basic<CONCRETE>::operator = (CONCRETE *rhs)
+template <class CONCRETE> ACE_INLINE CONCRETE *
+ACE_Based_Pointer<CONCRETE>::operator->(void)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator=");
-  if (rhs != 0)
-    this->target_ = ((char *) rhs
-                     - ((char *) this - this->base_offset_));
-  this->dump ();
+  return (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this));
 }
 
-template <class CONCRETE> ACE_INLINE void
-ACE_Based_Pointer<CONCRETE>::operator = (CONCRETE *rhs)
+template <class CONCRETE> ACE_INLINE CONCRETE *
+ACE_Based_Pointer<CONCRETE>::operator =(CONCRETE *from)
 {
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::operator=");
-  this->target_ = ((char *) rhs
-                   - ((char *) this - this->base_offset_));
-    this->dump ();
+  this->target_ = (CONCRETE *)((char *) from 
+                               - ((char *) this - this->base_offset_));
+  return from;
 }
 
 template <class CONCRETE> ACE_INLINE CONCRETE 
-ACE_Based_Pointer_Basic<CONCRETE>::operator *(void) const
+ACE_Based_Pointer<CONCRETE>::operator *(void) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator *");
-  this->dump ();
-  return *ACE_reinterpret_cast (CONCRETE *,
-                                ACE_COMPUTE_BASED_POINTER (this));
+  return *(CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this));
 }
 
-template <class CONCRETE> ACE_INLINE CONCRETE *
-ACE_Based_Pointer_Basic<CONCRETE>::addr (void) const
+template <class CONCRETE> ACE_INLINE 
+ACE_Based_Pointer<CONCRETE>::operator void *() const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::addr");
-    this->dump ();
-  return ACE_reinterpret_cast (CONCRETE *,
+  return ACE_reinterpret_cast (void *,
                                ACE_COMPUTE_BASED_POINTER (this));
 }
 
 template <class CONCRETE> ACE_INLINE CONCRETE
-ACE_Based_Pointer_Basic<CONCRETE>::operator [] (long index) const
+ACE_Based_Pointer<CONCRETE>::operator [] (long index) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator[]");
-    this->dump ();
-  CONCRETE *c = ACE_reinterpret_cast (CONCRETE *,
-                                      ACE_COMPUTE_BASED_POINTER (this));
-  return c[index];
+  return *((CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)) + index);
 }
 
 template <class CONCRETE> ACE_INLINE void
-ACE_Based_Pointer_Basic<CONCRETE>::operator += (long index)
+ACE_Based_Pointer<CONCRETE>::operator += (long index)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator+=");
-    this->dump ();
   this->base_offset_ += (index * sizeof (CONCRETE));
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator == (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator == (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator==");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) == ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator != (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator != (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator!=");
-    this->dump ();
   return !(*this == rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator < (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator < (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator<");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) < ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator <= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator <= (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator<=");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) <= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator > (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator > (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator>");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) > ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator >= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator >= (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator>=");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) >= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
-
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index cc4530c8b13..f9aaedf009d 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -165,10 +165,10 @@
 # elif (ACE_SIZEOF_SHORT) == 4 && defined(_CRAYMPP)
   // mpp cray - uses Alpha processors
   //   Use the real 32-bit quantity for ACE_INT32's, and use a "long"
-  //   for ACE_INT16's.  This gets around conflicts with size_t in some ACE
+  //   for shorts.  This gets around conflicts with size_t in some ACE
   //   method signatures, among other things.
-  typedef long ACE_INT16;
-  typedef unsigned long ACE_UINT16;
+  typedef short ACE_INT16;
+  typedef unsigned short ACE_UINT16;
   typedef short ACE_INT32;
   typedef unsigned short ACE_UINT32;
 # elif (ACE_SIZEOF_SHORT) == 8 && defined(_UNICOS)
@@ -196,7 +196,7 @@ typedef ACE_UINT16 ACE_USHORT16;
       typedef int ACE_INT32;
       typedef unsigned int ACE_UINT32;
 #   endif
-  typedef unsigned long long ACE_UINT64;
+  typedef unsigned long ACE_UINT64;
 # else
 #   error Have to add to the ACE_UINT32 type setting
 # endif
@@ -219,17 +219,6 @@ typedef ACE_UINT16 ACE_USHORT16;
 # error "Can't find a suitable type for doing pointer arithmetic."
 #endif /* ACE_SIZEOF_VOID_P */
 
-#if defined (ACE_LACKS_LONGLONG_T)
-  // This throws away the high 32 bits.  It's very unlikely that a
-  // pointer will be more than 32 bits wide if the platform does not
-  // support 64-bit integers.
-# define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \
-  ACE_reinterpret_cast (PTR_TYPE, L.lo ())
-#else  /* ! ACE_LACKS_LONGLONG_T */
-# define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \
-  ACE_reinterpret_cast (PTR_TYPE, ACE_static_cast (ptr_arith_t, L))
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
 // If the platform lacks a long long, define one.
 # if defined (ACE_LACKS_LONGLONG_T)
   class ACE_Export ACE_U_LongLong
@@ -318,6 +307,18 @@ typedef ACE_UINT16 ACE_USHORT16;
     ACE_UINT32 operator/ (const int) const;
 #   endif /* ACE_SIZEOF_INT != 4 */
 
+    // Conversion operator.  Try to avoid adding more of these,
+    // because they can lead to subtle problems.  But a conversion to
+    // ptr_arith_t is useful.
+#   if ACE_SIZEOF_VOID_P == ACE_SIZEOF_INT  || \
+       ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG
+      operator ptr_arith_t () { return data_.lo_; }
+#   elif ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+      operator ptr_arith_t () { return data_.hi_ << 32U  &  data_.lo_; }
+#   else
+#     error "Can't find a suitable type for doing pointer arithmetic."
+#   endif /* ACE_SIZEOF_VOID_P */
+
     // = Helper methods.
     void output (FILE * = stdout) const;
     // Outputs the value to the FILE, in hex.
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index e64d13b2791..aea3198e0dd 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -1,5 +1,37 @@
+// CDR_Stream.cpp
 // $Id$
 
+// Portions of this file are:
+// Copyright 1994-1995 by Sun Microsystems Inc.
+// All Rights Reserved
+
+// CDR:         Encode/Decode basic machine data types
+//
+// Implementation of OMG "Common Data Representation" (CDR) ... there
+// are one routine each for byte/halfword/word/doubleword put/get,
+// which adjust to establish "natural" alignment (the bulk of the
+// code) and then put or get with byteswapping as needed.
+//
+// The implementation knows that native data formats are conformant
+// with OMG-IDL's (and hence CDR's) size requirements, and relies on
+// the fact that (for example) CORBA's Long is always four bytes long
+// even if the environment's "int" is a different size.
+//
+//      char, octet                       8 bits (1 byte)
+//      short, unsigned short            16 bits (2 bytes)
+//      long, unsigned long, float       32 bits (4 bytes)
+//      double, (unsigned) long long     64 bits (8 bytes)
+//      long double                     128 bits (16 bytes)
+//
+// Moreover, this "knows" that the native 'char' represents ISO
+// Latin/1 characters (an ASCII superset addressing Western European
+// characters) and that "double" and "float" comply with the IEEE
+// standards. (The "long double" may not be a native data type,
+// though.)
+//
+// THREADING NOTE: "CDR" is a data structure which must be protected
+// by external critical sections.
+
 #define ACE_BUILD_DLL
 #include "ace/CDR_Stream.h"
 
@@ -85,20 +117,20 @@ ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
 }
 #endif /* NONNATIVE_LONGDOUBLE */
 
-#if defined(_UNICOS) && !defined(_CRAYMPP)
+#if defined(_UNICOS)
 // placeholders to get things compiling
 ACE_CDR::Float::Float()
 {
 }
 
-ACE_CDR::Float::Float(const float & init)
+ACE_CDR::Float::Float(const float & init))
 {
 }
 
-ACE_CDR::Float &
-ACE_CDR::Float::operator= (const float &rhs)
+float
+ACE_CDR::Float::operator= (const ACE_CDR::Float &rhs) const
 {
-    return *this;
+    return 0.0f;
 }
 
 int
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 13dad9d7ab5..95efb66f46a 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -4,32 +4,46 @@
 // ============================================================================
 //
 // = LIBRARY
-//   ace
+//    ace
 //
 // = FILENAME
-//   CDR_Stream.h
+//    CDR.h
 //
 // = DESCRIPTION
-//   ACE Common Data Representation (CDR) marshaling and demarshaling
-//   classes.
+//     Common Data Representation (CDR) marshaling streams.
 //
-//   This implementation was inspired in the CDR class in SunSoft's
-//   IIOP engine, but has a completely different implementation and a
-//   different interface too.
+//     This implementation assumes that the native numeric
+//     representation is two's complement for integers, IEEE
+//     single/double for floats.  Also that characters are in ISO
+//     Latin/1.
 //
-//   The current implementation assumes that the host has 1-byte,
-//   2-byte and 4-byte integral types, and that it has single
-//   precision and double precision IEEE floats.
-//   Those assumptions are pretty good these days, with Crays beign
-//   the only known exception.
+//     Note that CDR itself makes no such assumptions, but this
+//     implementation makes such assumptions for reasons of
+//     efficiency.  Careful enhancements could preserve that
+//     efficiency where the assumptions are true, yet still allow the
+//     code to work when they aren't true.
+//
+//     The implementation expects that buffers are aligned according
+//     to the strongest CDR alignment restriction.
+//
+//     NOTE: this does everything "CDR 1.1" does ... that is, it
+//     supports the five extended OMG-IDL data types in UNO Appendix
+//     A, which provide richer arithmetic types (64 bit integers,
+//     "quad precision" FP) and UNICODE-based characters and strings.
+//     Those types are not standard parts of OMG-IDL at this time.
+//
+//     THREADING NOTE: CDR data structures must be protected against
+//     concurrent access by their owning thread.
 //
 // = AUTHORS
-//   Aniruddha Gokhale <gokhale@cs.wustl.edu> and Carlos O'Ryan
-//   <coryan@cs.wustl.edu> for the original implementation in TAO.
-//   ACE version by Jeff Parsons <parsons@cs.wustl.edu>
-//   and Istvan Buki <istvan.buki@euronet.be>.
-//   Codeset translation by Jim Rogers (jrogers@viasoft.com) and
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
+//     Original copyright 1994-1995 by Sun Microsystems, Inc.  See
+//     $TAO_ROOT/COPYING.sun for more info.
+//     Many enhancements added by Aniruddha Gokhale
+//     <gokhale@cs.wustl.edu> and Carlos O'Ryan <coryan@cs.wustl.edu>
+//     for TAO.  ACE version by Jeff Parsons <parsons@cs.wustl.edu>
+//     and Istvan Buki <istvan.buki@euronet.be>.
+//     Codeset translation by Jim Rogers (jrogers@viasoft.com) and
+//     Carlos O'Ryan <coryan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -143,7 +157,7 @@ public:
   # if    (defined (_MSC_VER) && (_MSC_VER >= 900)) \
           || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))
       typedef __int64 LongLong;
-  # elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP)
+  # elif ACE_SIZEOF_LONG == 8
       typedef long LongLong;
   # elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
   #   if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) && !defined (__KCC)
@@ -179,11 +193,11 @@ public:
   #     else  /* ACE_SIZEOF_INT != 4 */
           // Applications will probably have trouble with this.
           char f[4];
-  #       if defined(_UNICOS) && !defined(_CRAYMPP)
-            Float (void);
-            Float (const float &init);
-            Float & operator= (const float &rhs);
-            int operator!= (const Float &rhs) const;
+  #       if defined(_UNICOS)
+        Float (void);
+        Float (const float &init);
+        float operator= (const Float &rhs) const;
+        int operator!= (const Float &rhs) const;
   #       endif /* _UNICOS */
   #     endif /* ACE_SIZEOF_INT != 4 */
       };
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index 6d7d0770773..376f981e5e4 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -21,26 +21,17 @@ ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Manager)
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Iterator)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator)
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
-
-#else
-
-#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES
+#define T_1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template <ACE_T1>
-ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
-                                                      size_t size,
-                                                      ACE_Allocator *alloc)
+  template <T_1>
+ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
+                                                   size_t size,
+                                                   ACE_Allocator *alloc)
   : caching_strategy_ (caching_s)
 {
   if (this->open (size, alloc) == -1)
@@ -50,29 +41,29 @@ ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_
 
 }
 
-template <ACE_T1>
-ACE_Cache_Map_Manager<ACE_T2>::~ACE_Cache_Map_Manager (void)
+template <T_1>
+ACE_Cache_Map_Manager<T_2>::~ACE_Cache_Map_Manager (void)
 {
   this->close ();
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::open (size_t length,
-                                     ACE_Allocator *alloc)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::open (size_t length,
+                                  ACE_Allocator *alloc)
 {
   return this->map_.open (length,
                           alloc);
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::close (void)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::close (void)
 {
   return this->map_.close ();
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
-                                     const VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::bind (const KEY &key,
+                                  const VALUE &value)
 {
   // Insert an entry which has the <key> and the <cache_value> which
   // is the combination of the <value> and the attributes of the
@@ -106,9 +97,9 @@ ACE_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
 }
 
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
-                                       const VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
+                                    const VALUE &value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -143,10 +134,10 @@ ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
 }
 
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
-                                       const VALUE &value,
-                                       VALUE &old_value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
+                                    const VALUE &value,
+                                    VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -190,11 +181,11 @@ ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
-                                       const VALUE &value,
-                                       KEY &old_key,
-                                       VALUE &old_value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
+                                    const VALUE &value,
+                                    KEY &old_key,
+                                    VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -239,9 +230,9 @@ ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::trybind (const KEY &key,
-                                        VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key,
+                                     VALUE &value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -281,9 +272,9 @@ ACE_Cache_Map_Manager<ACE_T2>::trybind (const KEY &key,
   return trybind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
-                                     VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
+                                  VALUE &value)
 {
   // Lookup the key and populate the <value>.
   CACHE_VALUE cache_value;
@@ -320,8 +311,8 @@ ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
   return find_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::find (const KEY &key)
 {
   // Lookup the key and populate the <value>.
   CACHE_VALUE cache_value;
@@ -358,8 +349,8 @@ ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key)
 }
 
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key)
 {
   // Remove the entry from the cache.
   CACHE_VALUE cache_value;
@@ -381,9 +372,9 @@ ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key)
   return unbind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key,
-                                       VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key,
+                                    VALUE &value)
 {
   // Remove the entry from the cache.
   CACHE_VALUE cache_value;
@@ -408,15 +399,15 @@ ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key,
 }
 
 
-template <ACE_T1> void
-ACE_Cache_Map_Manager<ACE_T2>::dump (void) const
+template <T_1> void
+ACE_Cache_Map_Manager<T_2>::dump (void) const
 {
   this->map_.dump ();
 
   this->caching_strategy_.dump ();
 }
 
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
 
 #endif /* ACE_CACHE_MAP_MANAGER_T_C */
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 82033b28b09..20dfb3b9e1d 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -28,25 +28,13 @@
 // Forward declaration.
 class ACE_Allocator;
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
 template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator;
 
 template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Reverse_Iterator;
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
-
-#else
-
-#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template <ACE_T1>
+template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Manager
 {
   // = TITLE
@@ -70,11 +58,12 @@ public:
   typedef VALUE mapped_type;
   typedef MAP map_type;
   typedef CACHING_STRATEGY caching_strategy_type;
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
   typedef ITERATOR_IMPL ITERATOR_IMPLEMENTATION;
   typedef REVERSE_ITERATOR_IMPL REVERSE_ITERATOR_IMPLEMENTATION;
+  typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE;
+  // The actual value mapped to the key in the map. The <attributes>
+  // are used by the strategy and is transparent to the user of this
+  // class.
 
   friend class ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>;
   friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>;
@@ -91,13 +80,6 @@ public:
   typedef REVERSE_ITERATOR
           reverse_iterator;
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE;
-  // The actual value mapped to the key in the map. The <attributes>
-  // are used by the strategy and is transparent to the user of this
-  // class.
-
   // = Initialization and termination methods.
 
   ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy,
@@ -186,8 +168,6 @@ public:
   void dump (void) const;
   // Dumps the state of the object.
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
   // = STL styled iterator factory functions.
 
   ITERATOR begin (void);
@@ -198,8 +178,6 @@ public:
   REVERSE_ITERATOR rend (void);
   // Return reverse iterator.
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
   MAP &map (void);
   // The map managed by the Cache_Map_Manager.
 
@@ -217,13 +195,11 @@ protected:
 private:
 
   // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<ACE_T2> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<ACE_T2> &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
 
 };
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
 template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator
 {
@@ -371,11 +347,6 @@ protected:
   // belonging to the Cache_Map_Manager.
 };
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#undef ACE_T1
-#undef ACE_T2
-
 #if defined (__ACE_INLINE__)
 #include "ace/Cache_Map_Manager_T.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i
index ab90786fe1b..1a199e8bc53 100644
--- a/ace/Cache_Map_Manager_T.i
+++ b/ace/Cache_Map_Manager_T.i
@@ -1,273 +1,259 @@
 /* -*- C++ -*- */
 //$Id$
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
+#define T_1  class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2  KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
-
-#else
-
-#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Manager<ACE_T2>::purge (void)
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Manager<T_2>::purge (void)
 {
-  return this->caching_strategy ().caching_utility ().clear_cache (this->map_,
-                                                                   this->caching_strategy ().purge_percent ());
+  return this->caching_strategy ().clear_cache (this->map_);
 }
 
-template <ACE_T1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<ACE_T2>::current_size (void) const
+template <T_1> ACE_INLINE size_t
+ACE_Cache_Map_Manager<T_2>::current_size (void) const
 {
   return this->map_.current_size ();
 }
 
-template <ACE_T1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<ACE_T2>::total_size (void) const
+template <T_1> ACE_INLINE size_t
+ACE_Cache_Map_Manager<T_2>::total_size (void) const
 {
   return this->map_.total_size ();
 }
 
-template <ACE_T1> ACE_INLINE MAP &
-ACE_Cache_Map_Manager<ACE_T2>::map (void)
+template <T_1> ACE_INLINE MAP &
+ACE_Cache_Map_Manager<T_2>::map (void)
 {
   return this->map_;
 }
 
-template <ACE_T1> ACE_INLINE CACHING_STRATEGY &
-ACE_Cache_Map_Manager<ACE_T2>::caching_strategy (void)
+template <T_1> ACE_INLINE CACHING_STRATEGY &
+ACE_Cache_Map_Manager<T_2>::caching_strategy (void)
 {
   return this->caching_strategy_;
 }
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::begin (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::begin (void)
 {
   return ITERATOR (this->map_.begin ());
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::end (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::end (void)
 {
   return ITERATOR (this->map_.end ());
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::rbegin (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::rbegin (void)
 {
   return REVERSE_ITERATOR (this->map_.rbegin ());
 }
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::rend (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::rend (void)
 {
   return REVERSE_ITERATOR (this->map_.rend ());
 }
 
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
 
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define ACE_T1 class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
+#define T_1 class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2 KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator <ACE_T2> &rhs)
-  : iterator_implementation_ (rhs.iterator_implementation_)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator <T_2> &rhs)
+ : iterator_implementation_ (rhs.iterator_implementation_)
 {
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>::~ACE_Cache_Map_Iterator (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>::~ACE_Cache_Map_Iterator (void)
 {
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Iterator<ACE_T2> &
-ACE_Cache_Map_Iterator<ACE_T2>::operator= (const ACE_Cache_Map_Iterator<ACE_T2> &rhs)
+template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<T_2> &
+ACE_Cache_Map_Iterator<T_2>::operator= (const ACE_Cache_Map_Iterator<T_2> &rhs)
 {
   this->iterator_implementation_ = rhs.iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Iterator<ACE_T2>::operator== (const ACE_Cache_Map_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Iterator<T_2>::operator== (const ACE_Cache_Map_Iterator<T_2> &rhs) const
 {
   return this->iterator_implementation_ == rhs.iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Iterator<ACE_T2>::operator!= (const ACE_Cache_Map_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Iterator<T_2>::operator!= (const ACE_Cache_Map_Iterator<T_2> &rhs) const
 {
   return this->iterator_implementation_ != rhs.iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Cache_Map_Iterator<ACE_T2>::operator* (void) const
+template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
+ACE_Cache_Map_Iterator<T_2>::operator* (void) const
 {
   value_type retn ((*this->iterator_implementation_).ext_id_,
                    (*this->iterator_implementation_).int_id_.first ());
   return retn;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2> &
-ACE_Cache_Map_Iterator<ACE_T2>::operator++ (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2> &
+ACE_Cache_Map_Iterator<T_2>::operator++ (void)
 {
   ++this->iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>
-ACE_Cache_Map_Iterator<ACE_T2>::operator++ (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>
+ACE_Cache_Map_Iterator<T_2>::operator++ (int)
 {
-  ACE_Cache_Map_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Iterator<T_2> retn = *this;
   ++this->iterator_implementation_;
   return retn;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2> &
-ACE_Cache_Map_Iterator<ACE_T2>::operator-- (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2> &
+ACE_Cache_Map_Iterator<T_2>::operator-- (void)
 {
   --this->iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>
-ACE_Cache_Map_Iterator<ACE_T2>::operator-- (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>
+ACE_Cache_Map_Iterator<T_2>::operator-- (int)
 {
-  ACE_Cache_Map_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Iterator<T_2> retn = *this;
   --this->iterator_implementation_;
   return retn;
 }
 
 
-template <ACE_T1> ACE_INLINE void
-ACE_Cache_Map_Iterator<ACE_T2>::dump (void) const
+template <T_1> ACE_INLINE void
+ACE_Cache_Map_Iterator<T_2>::dump (void) const
 {
   this->iterator_implementation_.dump ();
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl)
-  : iterator_implementation_ (iterator_impl)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl)
+ : iterator_implementation_ (iterator_impl)
 {
 }
 
-template <ACE_T1> ACE_INLINE IMPLEMENTATION &
-ACE_Cache_Map_Iterator<ACE_T2>::iterator_implementation (void)
+template <T_1> ACE_INLINE IMPLEMENTATION &
+ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void)
 {
   return this->iterator_implementation_;
 }
 
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
 
-////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define ACE_T1 class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
+#define T_1 class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2 KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator <ACE_T2> &rhs)
-  : reverse_iterator_implementation_ (rhs.reverse_iterator_implementation_)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator <T_2> &rhs)
+ : reverse_iterator_implementation_ (rhs.reverse_iterator_implementation_)
 {
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::~ACE_Cache_Map_Reverse_Iterator (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>::~ACE_Cache_Map_Reverse_Iterator (void)
 {
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<ACE_T2> &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator= (const ACE_Cache_Map_Reverse_Iterator<ACE_T2> &rhs)
+template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<T_2> &
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator= (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs)
 {
   this->reverse_iterator_implementation_ = rhs.reverse_iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator== (const ACE_Cache_Map_Reverse_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator== (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs) const
 {
   return this->reverse_iterator_implementation_ == rhs.reverse_iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator!= (const ACE_Cache_Map_Reverse_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator!= (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs) const
 {
   return this->reverse_iterator_implementation_ != rhs.reverse_iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator* (void) const
+template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator* (void) const
 {
   value_type retv ((*this->reverse_iterator_implementation_).ext_id_,
                    (*this->reverse_iterator_implementation_).int_id_.first ());
   return retv;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2> &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator++ (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2> &
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator++ (void)
 {
   ++this->reverse_iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator++ (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator++ (int)
 {
-  ACE_Cache_Map_Reverse_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Reverse_Iterator<T_2> retn = *this;
   ++this->reverse_iterator_implementation_;
   return retn;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2> &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator-- (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2> &
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator-- (void)
 {
   --this->reverse_iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator-- (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator-- (int)
 {
-  ACE_Cache_Map_Reverse_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Reverse_Iterator<T_2> retn = *this;
   --this->reverse_iterator_implementation_;
   return retn;
 }
 
 
-template <ACE_T1> ACE_INLINE void
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::dump (void) const
+template <T_1> ACE_INLINE void
+ACE_Cache_Map_Reverse_Iterator<T_2>::dump (void) const
 {
   this->reverse_iterator_implementation_.dump ();
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl)
-  : reverse_iterator_implementation_(iterator_impl)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl)
+ : reverse_iterator_implementation_(iterator_impl)
 {
 }
 
-template <ACE_T1> ACE_INLINE REVERSE_IMPLEMENTATION &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::iterator_implementation (void)
+template <T_1> ACE_INLINE REVERSE_IMPLEMENTATION &
+ACE_Cache_Map_Reverse_Iterator<T_2>::iterator_implementation (void)
 {
   return this->reverse_iterator_implementation_;
 }
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp
index 9a555c7922a..7fb4e9dacef 100644
--- a/ace/Cached_Connect_Strategy_T.cpp
+++ b/ace/Cached_Connect_Strategy_T.cpp
@@ -25,11 +25,8 @@
 
 ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$")
 
-#define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX
-#define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX
-
-template <ACE_T1>
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::ACE_Cached_Connect_Strategy_Ex
 (CACHING_STRATEGY &caching_s,
  ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
@@ -42,15 +39,14 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex
   if (this->open (cre_s, con_s, rec_s) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Cached_Connect_Strategy_Ex<ACE_T2>\n")));
+                ASYS_TEXT ("ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>\n")));
 }
 
-template <ACE_T1>
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::~ACE_Cached_Connect_Strategy_Ex (void)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void)
 {
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
   // Close down all cached service handlers.
-  for (ACE_TYPENAME CONNECTION_CACHE::ITERATOR iter = this->connection_cache_.begin ();
+  for (CONNECTION_CACHE_ITERATOR iter = this->connection_cache_.begin ();
        iter != this->connection_cache_.end ();
        ++iter)
     {
@@ -60,11 +56,30 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::~ACE_Cached_Connect_Strategy_Ex (void)
           (*iter).second ()->close ();
         }
     }
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::open
+(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+ ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+ ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
+{
+  int result = this->CCSBASE::open (cre_s, con_s, rec_s);
+  if (result == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ASYS_TEXT ("%p\n"),
+                       ASYS_TEXT ("Base initialisation failed\n")),
+                      -1);
+
+  if (this->caching_strategy ().open (&this->svc_cleanup_strategy_,
+                                      0) == -1)
+    return -1;
+
+  return 0;
+}
+
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::check_hint_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
  ACE_Time_Value *timeout,
@@ -88,7 +103,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
   CONNECTION_CACHE_ENTRY *possible_entry = (CONNECTION_CACHE_ENTRY *) sh->recycling_act ();
 
   // Check to see if the hint svc_handler has been closed down
-  if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED)
+  if (possible_entry->ext_id_.state () == ACE_Recyclable::CLOSED)
     {
       // If close, decrement refcount
       if (possible_entry->ext_id_.decrement () == 0)
@@ -108,9 +123,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
 
   // If hint is not closed, see if it is connected to the correct
   // address and is recyclable
-  else if ((possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
-            possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) &&
-           possible_entry->ext_id_.subject () == remote_addr)
+  else if (possible_entry->ext_id_ == remote_addr)
     {
       // Hint successful
       found = 1;
@@ -118,20 +131,6 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
       // Tell the <svc_handler> that it should prepare itself for
       // being recycled.
       this->prepare_for_recycling (sh);
-
-      //
-      // Update the caching attributes directly since we don't do a
-      // find() on the cache map.
-      //
-
-      // Indicates successful find.
-      int find_result = 0;
-
-      int result = this->caching_strategy ().notify_find (find_result,
-                                                          possible_entry->int_id_.second ());
-
-      if (result == -1)
-        return result;
     }
   else
     {
@@ -152,8 +151,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
   return 0;
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::find_or_create_svc_handler_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
  ACE_Time_Value *timeout,
@@ -168,7 +167,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
 
   // Try to find the address in the cache.  Only if we don't find it
   // do we create a new <SVC_HANDLER> and connect it with the server.
-  if (this->find (search_addr, entry) == -1)
+  if (this->connection_cache_.find (search_addr, entry) == -1)
     {
       // Set the flag
       found = 0;
@@ -179,12 +178,12 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
 
       // Connect using the svc_handler.
       if (this->cached_connect (sh,
-                                remote_addr,
-                                timeout,
-                                local_addr,
-                                reuse_addr,
-                                flags,
-                                perms) == -1)
+                         remote_addr,
+                         timeout,
+                         local_addr,
+                         reuse_addr,
+                         flags,
+                         perms) == -1)
         {
           return -1;
         }
@@ -217,24 +216,24 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
 
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
-                                                        const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                                                        ACE_Time_Value *timeout,
-                                                        const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                                        int reuse_addr,
-                                                        int flags,
-                                                        int perms)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cached_connect (SVC_HANDLER *&sh,
+                                                                                                                 const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                                                                                                 ACE_Time_Value *timeout,
+                                                                                                                 const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                                                                                                 int reuse_addr,
+                                                                                                                 int flags,
+                                                                                                                 int perms)
 {
   // Actively establish the connection.  This is a timed blocking
   // connect.
-  if (this->new_connection (sh,
-                            remote_addr,
-                            timeout,
-                            local_addr,
-                            reuse_addr,
-                            flags,
-                            perms) == -1)
+  if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                   remote_addr,
+                                                   timeout,
+                                                   local_addr,
+                                                   reuse_addr,
+                                                   flags,
+                                                   perms) == -1)
     {
       // If connect() failed because of timeouts, we have to reject
       // the connection entirely. This is necessary since currently
@@ -244,24 +243,24 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
 
       if (errno == EWOULDBLOCK)
         errno = ENOTSUP;
-      else if (ACE::out_of_handles (errno))
+      else if (errno == EMFILE)
         {
           // If the connect failed due to the process running out of
           // file descriptors then, auto_purging of some connections
           // are done from the CONNECTION_CACHE. This frees the
           // descriptors which get used in the connect process and
           // hence the same method is called again!
-          if (this->purge_connections () == -1)
+          if (this->purge_connections (this->caching_strategy ().purge_percent ()) == -1)
             return -1;
 
           // Try connecting again.
-          if (this->new_connection (sh,
-                                    remote_addr,
-                                    timeout,
-                                    local_addr,
-                                    reuse_addr,
-                                    flags,
-                                    perms) == -1)
+          if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                           remote_addr,
+                                                           timeout,
+                                                           local_addr,
+                                                           reuse_addr,
+                                                           flags,
+                                                           perms) == -1)
             {
               if (errno == EWOULDBLOCK)
                 errno = ENOTSUP;
@@ -279,8 +278,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
 }
 
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::connect_svc_handler_i
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::connect_svc_handler_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
  ACE_Time_Value *timeout,
@@ -329,7 +328,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::connect_svc_handler_i
 
   // For all successful cases: mark the <svc_handler> in the cache
   // as being <in_use>.  Therefore recyclable is BUSY.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_BUSY);
+  entry->ext_id_.state (ACE_Recyclable::BUSY);
 
   // And increment the refcount
   entry->ext_id_.increment ();
@@ -338,46 +337,22 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::connect_svc_handler_i
 }
 
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cache_i (const void *recycling_act)
-{
-  // The wonders and perils of ACT
-  CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE);
-
-  return 0;
-}
-
-template<ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::recycle_state_i (const void *recycling_act,
-                                                         ACE_Recyclable_State new_state)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cache_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
 
   // Mark the <svc_handler> in the cache as not being <in_use>.
   // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (new_state);
+  entry->ext_id_.state (ACE_Recyclable::IDLE_AND_PURGABLE);
 
   return 0;
 }
 
-template<ACE_T1> ACE_Recyclable_State
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::recycle_state_i (const void *recycling_act) const
-{
-  // The wonders and perils of ACT
-  CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  return entry->ext_id_.recycle_state ();
-}
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::purge_i (const void *recycling_act)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
@@ -386,20 +361,20 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::purge_i (const void *recycling_act)
 }
 
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::mark_as_closed_i (const void *recycling_act)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::mark_as_closed_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
 
   // Mark the <svc_handler> in the cache as CLOSED.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_CLOSED);
+  entry->ext_id_.state (ACE_Recyclable::CLOSED);
 
   return 0;
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_act)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup_hint_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
@@ -409,7 +384,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_ac
 
   // If the svc_handler state is closed and the refcount == 0, call
   // close() on svc_handler.
-  if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED &&
+  if (entry->ext_id_.state () == ACE_Recyclable::CLOSED &&
       refcount == 0)
     {
       entry->int_id_.first ()->recycler (0, 0);
@@ -420,74 +395,20 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_ac
   return 0;
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::purge_connections (void)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections (double percentage)
 {
+  // Set the percentage of entries to remove and then call purge on the cache.
+  this->caching_strategy ().purge_percent (percentage);
   return this->connection_cache_.purge ();
 }
 
-template <ACE_T1> CACHING_STRATEGY &
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::caching_strategy (void)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> CACHING_STRATEGY &
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy (void)
 {
   return this->connection_cache_.caching_strategy ();
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-                                              ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry)
-{
-  typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                       ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
-                                       ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Null_Mutex>
-    CONNECTION_CACHE_BUCKET_ITERATOR;
-
-  CONNECTION_CACHE_BUCKET_ITERATOR iterator (this->connection_cache_.map (),
-                                             search_addr);
-
-  CONNECTION_CACHE_BUCKET_ITERATOR end (this->connection_cache_.map (),
-                                        search_addr,
-                                        1);
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      REFCOUNTED_HASH_RECYCLABLE_ADDRESS &addr = (*iterator).ext_id_;
-
-      if (addr.recycle_state () != ACE_RECYCLABLE_IDLE_AND_PURGABLE &&
-          addr.recycle_state () != ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE)
-        continue;
-
-      if (addr.subject () != search_addr.subject ())
-        continue;
-
-      entry = &(*iterator);
-
-      //
-      // Update the caching attributes directly since we don't do a
-      // find() on the cache map.
-      //
-
-      // Indicates successful find.
-      int find_result = 0;
-
-      int result = this->caching_strategy ().notify_find (find_result,
-                                                          entry->int_id_.second ());
-
-      if (result == -1)
-        return result;
-
-      return 0;
-    }
-
-  return -1;
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Cached_Connect_Strategy_Ex)
 
-#undef ACE_T1
-#undef ACE_T2
-
 #endif /* CACHED_CONNECT_STRATEGY_T_C */
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index 55f1c3dc411..59f070c9a46 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -57,18 +57,34 @@ public:
   virtual ~ACE_Cached_Connect_Strategy_Ex (void);
   // Destructor
 
-  virtual int purge_connections (void);
+  virtual int open (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+                    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+                    ACE_Recycling_Strategy<SVC_HANDLER> *rec_s);
+  // This methods allow you to change the strategies used by the
+  // cached connector.
+
+  virtual int cached_connect (SVC_HANDLER *&sh,
+                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                              ACE_Time_Value *timeout,
+                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                              int reuse_addr,
+                              int flags,
+                              int perms);
+  // Connection of the svc_handler with the remote host.
+  // This method also encapsulates the connection done with
+  // auto_purging under the hood. If the connect failed due to the
+  // process running out of file descriptors then, auto_purging of
+  // some connections are done from the CONNECTION_CACHE. This frees
+  // the descriptors which get used in the connect process and hence
+  // the connect operation can succeed.
+
+  virtual int purge_connections (double percentage = 10);
   // Explicit purging of connection entries from the connection cache.
 
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-  typedef ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                     SVC_HANDLER *,
-                                     ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                     ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                     CACHING_STRATEGY,
-                                     ATTRIBUTES>
+  typedef ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY, ATTRIBUTES>
           CONNECTION_CACHE;
   typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY
           CONNECTION_CACHE_ENTRY;
@@ -76,16 +92,12 @@ public:
           KEY;
   typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type
           VALUE;
+  typedef ACE_TYPENAME CONNECTION_CACHE::ITERATOR
+          CONNECTION_CACHE_ITERATOR;
 
   // = Cleanup of the svc_handler.
-  typedef ACE_Recyclable_Handler_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                                  ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
-                                                  ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                                                          ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
-                                                                          ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                                                          ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                                                          MUTEX> >
-          CLEANUP_STRATEGY;
+  typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, MUTEX> >
+          SVC_CLEANUP_STRATEGY;
 
   typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>
           CCSBASE;
@@ -95,21 +107,12 @@ public:
 
 protected:
 
-  int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-            ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry);
-  // Find an idle handle.
-
   virtual int purge_i (const void *recycling_act);
   // Remove from cache (non-locking version).
 
   virtual int cache_i (const void *recycling_act);
   // Add to cache (non-locking version).
 
-  virtual int recycle_state_i (const void *recycling_act,
-                               ACE_Recyclable_State new_state);
-  virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const;
-  // Get/Set <recycle_state> (non-locking version).
-
   virtual int mark_as_closed_i (const void *recycling_act);
   // Mark as closed (non-locking version).
 
@@ -117,7 +120,8 @@ protected:
   // Cleanup hint.
 
   // = Helpers
-  int check_hint_i (SVC_HANDLER *&sh,
+
+  virtual int check_hint_i (SVC_HANDLER *&sh,
                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                     ACE_Time_Value *timeout,
                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -127,7 +131,8 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
                     int &found);
 
-  int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
+
+  virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                     ACE_Time_Value *timeout,
                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -138,31 +143,20 @@ protected:
                                     int &found);
 
   virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
-                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                                     ACE_Time_Value *timeout,
-                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                     int reuse_addr,
-                                     int flags,
-                                     int perms,
-                                     int &found);
-
-  virtual int cached_connect (SVC_HANDLER *&sh,
-                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                              ACE_Time_Value *timeout,
-                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                              int reuse_addr,
-                              int flags,
-                              int perms);
-  // Connection of the svc_handler with the remote host.  This method
-  // also encapsulates the connection done with auto_purging under the
-  // hood. If the connect failed due to the process running out of
-  // file descriptors then, auto_purging of some connections are done
-  // from the CONNECTION_CACHE. This frees the descriptors which get
-  // used in the connect process and hence the connect operation can
-  // succeed.
+                             const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                             ACE_Time_Value *timeout,
+                             const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                             int reuse_addr,
+                             int flags,
+                             int perms,
+                             int &found);
 
   CONNECTION_CACHE connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.
+
+  SVC_CLEANUP_STRATEGY svc_cleanup_strategy_;
+  // The strategy which controls the destruction and closing of the
+  // svc_handler.
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp
index f36d593ad84..532064ae23e 100644
--- a/ace/Caching_Strategies_T.cpp
+++ b/ace/Caching_Strategies_T.cpp
@@ -15,39 +15,367 @@
 
 ACE_RCSID(ace, Caching_Strategies_T, "$Id$")
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Caching_Strategy (void)
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                 int delete_cleanup_strategy,
+                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                 int delete_caching_strategy_utility)
   : timer_ (0),
-    purge_percent_ (10)
+    purge_percent_ (10),
+    entries_ (0),
+    cleanup_strategy_ (0),
+    delete_cleanup_strategy_ (1),
+    caching_strategy_utility_ (0),
+    delete_caching_strategy_utility_ (1)
 {
+  if (this->open (cleanup_s,
+                  delete_cleanup_strategy,
+                  utility_s,
+                  delete_caching_strategy_utility) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy")));
+
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_LRU_Caching_Strategy (void)
+{
+  if (this->delete_cleanup_strategy_ == 1)
+    delete this->cleanup_strategy_;
+  this->delete_cleanup_strategy_ = 0;
+  this->cleanup_strategy_ = 0;
+
+  if (this->delete_caching_strategy_utility_ == 1)
+    delete this->caching_strategy_utility_;
+  this->delete_caching_strategy_utility_ = 0;
+  this->caching_strategy_utility_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                             int delete_cleanup_strategy,
+                                                                                             CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                             int delete_caching_strategy_utility)
+{
+  // Initialise the cleanup strategy.
+
+  // First we decide whether we need to clean up.
+   if (this->cleanup_strategy_ != 0 &&
+      this->delete_cleanup_strategy_ == 1 &&
+      cleanup_s != 0)
+    {
+      delete this->cleanup_strategy_;
+      this->cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = 0;
+    }
+
+  if (cleanup_s != 0)
+    {
+      this->cleanup_strategy_ = cleanup_s;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+    }
+  else if (this->cleanup_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->cleanup_strategy_,
+                      CLEANUP_STRATEGY,
+                      -1);
+
+      this->delete_cleanup_strategy_ = 1;
+    }
+
+  // Initialise the caching strategy utility.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_utility_ != 0 &&
+      this->delete_caching_strategy_utility_ == 1 &&
+      utility_s != 0)
+    {
+      delete this->caching_strategy_utility_;
+      this->caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = 0;
+    }
+
+  if (utility_s != 0)
+    {
+      this->caching_strategy_utility_ = utility_s;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
+    }
+  else if (this->caching_strategy_utility_ == 0)
+    {
+      ACE_NEW_RETURN (this->caching_strategy_utility_,
+                      CACHING_STRATEGY_UTILITY,
+                      -1);
+
+      this->delete_caching_strategy_utility_ = 1;
+    }
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
+{
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy (void)
-  : purge_percent_ (10)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_LFU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                 int delete_cleanup_strategy,
+                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                 int delete_caching_strategy_utility)
+  : purge_percent_ (10),
+    entries_ (0),
+    cleanup_strategy_ (0),
+    delete_cleanup_strategy_ (1),
+    caching_strategy_utility_ (0),
+    delete_caching_strategy_utility_ (1)
+{
+  if (this->open (cleanup_s,
+                  delete_cleanup_strategy,
+                  utility_s,
+                  delete_caching_strategy_utility) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy")));
+
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_LFU_Caching_Strategy (void)
+{
+  if (this->delete_cleanup_strategy_ == 1)
+    delete this->cleanup_strategy_;
+  this->delete_cleanup_strategy_ = 0;
+  this->cleanup_strategy_ = 0;
+
+  if (this->delete_caching_strategy_utility_ == 1)
+    delete this->caching_strategy_utility_;
+  this->delete_caching_strategy_utility_ = 0;
+  this->caching_strategy_utility_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                             int delete_cleanup_strategy,
+                                                                                             CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                             int delete_caching_strategy_utility)
+{
+  // Initialise the cleanup strategy.
+
+  // First we decide whether we need to clean up.
+  if (this->cleanup_strategy_ != 0 &&
+      this->delete_cleanup_strategy_ == 1 &&
+      cleanup_s != 0)
+    {
+      delete this->cleanup_strategy_;
+      this->cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+    }
+
+  if (cleanup_s != 0)
+    this->cleanup_strategy_ = cleanup_s;
+  else if (this->cleanup_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->cleanup_strategy_,
+                      CLEANUP_STRATEGY,
+                      -1);
+
+      this->delete_cleanup_strategy_ = 1;
+    }
+
+  // Initialise the caching strategy utility.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_utility_ != 0 &&
+      this->delete_caching_strategy_utility_ == 1 &&
+      utility_s != 0)
+    {
+      delete this->caching_strategy_utility_;
+      this->caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
+    }
+
+  if (utility_s != 0)
+    this->caching_strategy_utility_ = utility_s;
+  else if (this->caching_strategy_utility_ == 0)
+    {
+      ACE_NEW_RETURN (this->caching_strategy_utility_,
+                      CACHING_STRATEGY_UTILITY,
+                      -1);
+
+      this->delete_caching_strategy_utility_ = 1;
+    }
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
 {
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_);
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_FIFO_Caching_Strategy (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                   int delete_cleanup_strategy,
+                                                                                                                   CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                   int delete_caching_strategy_utility)
   : order_ (0),
-    purge_percent_ (10)
+    purge_percent_ (10),
+    entries_ (0),
+    cleanup_strategy_ (0),
+    delete_cleanup_strategy_ (1),
+    caching_strategy_utility_ (0),
+    delete_caching_strategy_utility_ (1)
+{
+  if (this->open (cleanup_s,
+                  delete_cleanup_strategy,
+                  utility_s,
+                  delete_caching_strategy_utility) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_FIFO_Caching_Strategy::ACE_FIFO_Caching_Strategy")));
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_FIFO_Caching_Strategy (void)
+
 {
+  if (this->delete_cleanup_strategy_ == 1)
+    delete this->cleanup_strategy_;
+  this->delete_cleanup_strategy_ = 0;
+  this->cleanup_strategy_ = 0;
+
+  if (this->delete_caching_strategy_utility_ == 1)
+    delete this->caching_strategy_utility_;
+  this->delete_caching_strategy_utility_ = 0;
+  this->caching_strategy_utility_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                              int delete_cleanup_strategy,
+                                                                                              CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                              int delete_caching_strategy_utility)
+{
+  // Initialise the cleanup strategy.
+
+  // First we decide whether we need to clean up.
+  if (this->cleanup_strategy_ != 0 &&
+      this->delete_cleanup_strategy_ == 1 &&
+      cleanup_s != 0)
+    {
+      delete this->cleanup_strategy_;
+      this->cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+    }
+
+  if (cleanup_s != 0)
+    this->cleanup_strategy_ = cleanup_s;
+  else if (this->cleanup_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->cleanup_strategy_,
+                      CLEANUP_STRATEGY,
+                      -1);
+
+      this->delete_cleanup_strategy_ = 1;
+    }
+
+  // Initialise the caching strategy utility.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_utility_ != 0 &&
+      this->delete_caching_strategy_utility_ == 1 &&
+      utility_s != 0)
+    {
+      delete this->caching_strategy_utility_;
+      this->caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
+    }
+
+  if (utility_s != 0)
+    this->caching_strategy_utility_ = utility_s;
+  else if (this->caching_strategy_utility_ == 0)
+    {
+      ACE_NEW_RETURN (this->caching_strategy_utility_,
+                      CACHING_STRATEGY_UTILITY,
+                      -1);
+
+      this->delete_caching_strategy_utility_ = 1;
+    }
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
+{
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                   int delete_cleanup_strategy,
+                                                                                                                   CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                   int delete_caching_strategy_utility)
+{
+  ACE_UNUSED_ARG (cleanup_s);
+  ACE_UNUSED_ARG (delete_cleanup_strategy);
+  ACE_UNUSED_ARG (utility_s);
+  ACE_UNUSED_ARG (delete_caching_strategy_utility);
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                              int delete_cleanup_strategy,
+                                                                                              CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                              int delete_caching_strategy_utility)
+{
+  ACE_UNUSED_ARG (cleanup_s);
+  ACE_UNUSED_ARG (delete_cleanup_strategy);
+  ACE_UNUSED_ARG (utility_s);
+  ACE_UNUSED_ARG (delete_caching_strategy_utility);
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Null_Caching_Strategy (void)
+{
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
+{
+  ACE_UNUSED_ARG (container);
+
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LRU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_LFU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Caching_Strategy)
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index 41966b677f0..44b5e31f096 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -25,11 +25,9 @@
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4503)
-#endif /* _MSC_VER */
+#include "ace/Cleanup_Strategies_T.h"
 
-template <class ATTRIBUTES, class CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_Caching_Strategy
 {
   // = TITLE
@@ -44,6 +42,12 @@ public:
   virtual ~ACE_Caching_Strategy (void);
   // Destructor.
 
+  virtual int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                    int delete_cleanup_strategy = 1,
+                    CACHING_STRATEGY_UTILITY *utility_s = 0,
+                    int delete_caching_strategy_utility = 1) = 0;
+  // This method which does the actual initialisation.
+
   virtual ATTRIBUTES attributes (void) = 0;
   // Accessor method for the timer attributes.
 
@@ -78,8 +82,9 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
-  virtual CACHING_UTILITY &caching_utility (void) = 0;
-  // Purge the cache.
+  virtual int clear_cache (CONTAINER &container) = 0;
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   virtual void dump (void) const = 0;
   // Dumps the state of the object.
@@ -87,8 +92,8 @@ public:
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION>
-class ACE_Caching_Strategy_Adapter : public ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION>
+class ACE_Caching_Strategy_Adapter : public ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>
 {
   // = TITLE
   //     This class follows the Adaptor pattern and is used to provide
@@ -109,6 +114,12 @@ public:
   ~ACE_Caching_Strategy_Adapter (void);
   // Destructor.
 
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
+
   ATTRIBUTES attributes (void);
   // Accessor method for the timer attributes.
 
@@ -143,12 +154,13 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
+
   IMPLEMENTATION &implementation (void);
   // Accessor to the implementation.
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
-
   void dump (void) const;
   // Dumps the state of the object.
 
@@ -163,7 +175,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class ATTRIBUTES, class CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_LRU_Caching_Strategy
 {
   // = TITLE
@@ -181,7 +193,7 @@ class ACE_LRU_Caching_Strategy
   //     The ATTRIBUTES are the deciding factor for purging of entries
   //     and should logically be included with the VALUE. Some ways of
   //     doing this are: As being a member of the VALUE or VALUE being
-  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
+  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
   //     to purge.
 
@@ -189,18 +201,37 @@ public:
 
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
 
   // = Initialisation and termination.
 
-  ACE_LRU_Caching_Strategy (void);
-  // The <container> is the map in which the entries reside.  The
-  // timer attribute is initialed to zero in this constructor.  And
-  // the <purge_percent> field denotes the percentage of the entries
+  ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                            int delete_cleanup_strategy = 1,
+                            CACHING_STRATEGY_UTILITY *utility_s = 0,
+                            int delete_caching_strategy_utility = 1);
+  // The <container> is the map in which the entries reside.
+  // The Cleanup_Strategy is the callback class to which the entries
+  // to be cleaned up will be delegated. The <delete_cleanup_strategy>
+  // flag is needed to decide the ownership of the cleanup strategy.
+  // Also, the timer attribute is initialed to zero in this constructor.
+  // And the <purge_percent> field denotes the percentage of the entries
   // in the cache which can be purged automagically and by default is
-  // set to 10%.
+  // set to 10%. The ultility which helps the caching strategy in the
+  // purging of entries needs to be specified. By default a new one
+  // will be created of type CACHING_STRATEGY_UTILITY and
+  // <delete_caching_strategy_utility> decides whether to destroy the
+  // utility object or not.
+
+  ~ACE_LRU_Caching_Strategy (void);
 
   // = Operations of the strategy.
 
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
+
   ATTRIBUTES attributes (void);
   // Accessor method for the timer attributes.
 
@@ -237,14 +268,17 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
+  typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
+
   ATTRIBUTES timer_;
   // This element is the one which is the deciding factor for purging
   // of an ITEM.
@@ -252,14 +286,31 @@ private:
   double purge_percent_;
   // The level about which the purging will happen automagically.
 
-  CACHING_UTILITY caching_utility_;
+  unsigned int entries_;
+  // The no of entries bound in the cache.
+
+  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  // The cleanup strategy which can be used to destroy the entries of
+  // the container.
+
+  int delete_cleanup_strategy_;
+  // The flag which denotes the ownership of the cleanup strategy.
+  // If 1 then this class itself will destroy the strategy.
+
+  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
+
+  int delete_caching_strategy_utility_;
+  // The flag which denotes the ownership of the
+  // caching_strategy_utility. If 1 then this class itself will
+  // destroy the strategy utility object.
+
 };
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class ATTRIBUTES, class CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_LFU_Caching_Strategy
 {
   // = TITLE
@@ -277,7 +328,7 @@ class ACE_LFU_Caching_Strategy
   //     The ATTRIBUTES are the deciding factor for purging of entries
   //     and should logically be included with the VALUE. Some ways of
   //     doing this are: As being a member of the VALUE or VALUE being
-  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
+  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
   //     to purge.
 
@@ -285,15 +336,34 @@ public:
 
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
 
   // = Initialisation and termination methods.
 
-  ACE_LFU_Caching_Strategy (void);
-  // The <container> is the map in which the entries reside.  The
-  // timer attribute is initialed to zero in this constructor.  And
-  // the <purge_percent> field denotes the percentage of the entries
+  ACE_LFU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                            int delete_cleanup_strategy = 1,
+                            CACHING_STRATEGY_UTILITY *utility_s = 0,
+                            int delete_caching_strategy_utility = 1);
+  // The <container> is the map in which the entries reside.
+  // The Cleanup_Strategy is the callback class to which the entries
+  // to be cleaned up will be delegated. The <delete_cleanup_strategy>
+  // flag is needed to decide the ownership of the cleanup strategy.
+  // Also, the timer attribute is initialed to zero in this constructor.
+  // And the <purge_percent> field denotes the percentage of the entries
   // in the cache which can be purged automagically and by default is
-  // set to 10%.
+  // set to 10%.The ultility which helps the caching strategy in the
+  // purging of entries will be default be the
+  // ACE_Caching_Strategy_Utility and the
+  // <delete_caching_strategy_utility> decides whether to destroy the
+  // utility or not.
+
+  ~ACE_LFU_Caching_Strategy (void);
+
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
 
   // = Strategy methods.
 
@@ -331,25 +401,45 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
+  typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
+
   double purge_percent_;
   // The level about which the purging will happen automagically.
 
-  CACHING_UTILITY caching_utility_;
+  unsigned int entries_;
+  // The no of entries bound in the cache.
+
+  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  // The cleanup strategy which can be used to destroy the entries of
+  // the container.
+
+  int delete_cleanup_strategy_;
+  // The flag which denotes the ownership of the cleanup strategy.
+  // If 1 then this class itself will destroy the strategy.
+
+  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
+
+  int delete_caching_strategy_utility_;
+  // The flag which denotes the ownership of the
+  // caching_strategy_utility. If 1 then this class itself will
+  // destroy the strategy utility object.
 };
 
 /////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_FIFO_Caching_Strategy
 {
   // = TITLE
@@ -365,22 +455,41 @@ class ACE_FIFO_Caching_Strategy
   //     The ATTRIBUTES are the deciding factor for purging of entries
   //     and should logically be included with the VALUE. Some ways of
   //     doing this are: As being a member of the VALUE or VALUE being
-  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
+  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
   //     to purge.
 
 public:
 
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
 
   // = Initialisation and termination.
 
-  ACE_FIFO_Caching_Strategy (void);
-  // The <container> is the map in which the entries reside.  The
-  // timer attribute is initialed to zero in this constructor.  And
-  // the <purge_percent> field denotes the percentage of the entries
+  ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                             int delete_cleanup_strategy = 1,
+                             CACHING_STRATEGY_UTILITY *utility_s = 0,
+                             int delete_caching_strategy_utility = 1);
+  // The <container> is the map in which the entries reside.
+  // The Cleanup_Strategy is the callback class to which the entries
+  // to be cleaned up will be delegated. The <delete_cleanup_strategy>
+  // flag is needed to decide the ownership of the cleanup strategy.
+  // Also, the timer attribute is initialed to zero in this constructor.
+  // And the <purge_percent> field denotes the percentage of the entries
   // in the cache which can be purged automagically and by default is
-  // set to 10%.
+  // set to 10%.The ultility which helps the caching strategy in the
+  // purging of entries will be default be the
+  // ACE_Caching_Strategy_Utility and the
+  // <delete_caching_strategy_utility> decides whether to destroy the
+  // utility or not.
+
+  ~ACE_FIFO_Caching_Strategy (void);
+
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
 
   // = Strategy methods.
 
@@ -417,14 +526,17 @@ public:
                      const ATTRIBUTES &attr);
   // Notification for an item getting bound again into the cache.
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
+  typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
+
   ATTRIBUTES order_;
   // The order is the deciding factor for the item to be removed from
   // the cache.
@@ -432,12 +544,29 @@ private:
   double purge_percent_;
   // The level about which the purging will happen automagically.
 
-  CACHING_UTILITY caching_utility_;
+  unsigned int entries_;
+  // The no of entries bound in the cache.
+
+  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  // The cleanup strategy which can be used to destroy the entries of
+  // the container.
+
+  int delete_cleanup_strategy_;
+  // The flag which denotes the ownership of the cleanup strategy.
+  // If 1 then this class itself will destroy the strategy.
+
+  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
+
+  int delete_caching_strategy_utility_;
+  // The flag which denotes the ownership of the
+  // caching_strategy_utility. If 1 then this class itself will
+  // destroy the strategy utility object.
+
 };
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_Null_Caching_Strategy
 {
   // = TITLE
@@ -452,6 +581,23 @@ public:
 
   // = Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
+
+  // = Initialisation and termination.
+
+  ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                             int delete_cleanup_strategy = 1,
+                             CACHING_STRATEGY_UTILITY *utility_s = 0,
+                             int delete_caching_strategy_utility = 1);
+
+  ~ACE_Null_Caching_Strategy (void);
+
+
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
 
   // = Strategy methods. All are NO_OP methods!!!
 
@@ -488,17 +634,13 @@ public:
                      const ATTRIBUTES &attr);
   // Notification for an item getting bound again into the cache.
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
-private:
-
-  CACHING_UTILITY caching_utility_;
-  // This is the helper class which will decide and expunge entries
-  // from the cache.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i
index 8a6e2493b9e..8e114434cf2 100644
--- a/ace/Caching_Strategies_T.i
+++ b/ace/Caching_Strategies_T.i
@@ -3,9 +3,9 @@
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
-                                                                                                         int delete_implementation)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE 
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
+                                                                                                                                         int delete_implementation)
   : implementation_ (implementation),
     delete_implementation_ (delete_implementation)
 {
@@ -17,89 +17,100 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_C
     }
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::~ACE_Caching_Strategy_Adapter (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE 
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::~ACE_Caching_Strategy_Adapter (void)
 {
   if (this->delete_implementation_)
-    {
-      delete this->implementation_;
-      this->delete_implementation_ = 0;
-      this->implementation_ = 0;
-    }
+    delete this->implementation_;
+  this->delete_implementation_ = 0;
+  this->implementation_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                 int delete_cleanup_strategy,
+                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                 int delete_caching_strategy_utility)
+{
+  return this->implementation_->open (cleanup_s,
+                                      delete_cleanup_strategy,
+                                      utility_s,
+                                      delete_caching_strategy_utility);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE ATTRIBUTES
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE ATTRIBUTES
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::attributes (void)
 {
   return this->implementation_->attributes ();
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE double
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE double
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (void)
 {
   return this->implementation_->purge_percent ();
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE void
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (double percentage)
 {
   this->implementation_->purge_percent (percentage);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_bind (int result,
-                                                                                        const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_bind (int result,
+                                                                                                                        const ATTRIBUTES &attr)
 {
   return this->implementation_->notify_bind (result,
                                              attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_find (int result,
-                                                                                        ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_find (int result,
+                                                                                                                        ATTRIBUTES &attr)
 {
   return this->implementation_->notify_find (result,
                                              attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_unbind (int result,
-                                                                                          const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_unbind (int result,
+                                                                                                                          const ATTRIBUTES &attr)
 {
   return this->implementation_->notify_unbind (result,
                                                attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_trybind (int result,
-                                                                                           ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_trybind (int result,
+                                                                                                                           ATTRIBUTES &attr)
 {
   return this->implementation_->notify_trybind (result,
                                                 attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_rebind (int result,
-                                                                                          const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_rebind (int result,
+                                                                                                                          const ATTRIBUTES &attr)
 {
   return this->implementation_->notify_rebind (result,
                                                attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE IMPLEMENTATION &
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::implementation (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::clear_cache (CONTAINER &container)
 {
-  return *this->implementation_;
+  return this->implementation_->clear_cache (container);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE CACHING_UTILITY &
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::caching_utility (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE IMPLEMENTATION &
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::implementation (void)
 {
-  return this->implementation_->caching_utility ();
+  return *this->implementation_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE void
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump (void) const
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::dump (void) const
 {
   ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump");
 
@@ -109,39 +120,42 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return this->timer_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                    const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                    const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   if (result == 0)
-    ++this->timer_;
+    {
+      ++this->timer_;
+      ++this->entries_;
+    }
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                    ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                    ATTRIBUTES &attr)
 {
   if (result == 0)
     {
@@ -152,26 +166,26 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                       ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                       ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
@@ -181,14 +195,8 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
 
@@ -199,78 +207,79 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return 0;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                    const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                    const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
+  if (result == 0)
+    ++this->entries_;
+
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                    ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                    ATTRIBUTES &attr)
 {
+  ACE_UNUSED_ARG (attr);
+
   if (result == 0)
     ++attr;
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                       ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                       ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
+  if (result == 0)
+    ++this->entries_;
+
   return result;
 }
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
 
@@ -280,83 +289,84 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 
 //////////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return this->order_;
 }
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                     const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                     const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   if (result == 0)
-    ++this->order_;
+    {
+      ++this->order_;
+      ++this->entries_;
+    }
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                     ATTRIBUTES &attr)
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                     ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                        ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                        ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   if (result == 0)
-    ++this->order_;
+    {
+      ++this->order_;
+      ++this->entries_;
+    }
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
 
@@ -367,77 +377,71 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return 0;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return 0;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   ACE_UNUSED_ARG (percentage);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                     const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                     const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                     ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                     ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                        ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                        ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
 
diff --git a/ace/Caching_Utility_T.cpp b/ace/Caching_Utility_T.cpp
index 2d9b4c072ef..03a95809c22 100644
--- a/ace/Caching_Utility_T.cpp
+++ b/ace/Caching_Utility_T.cpp
@@ -9,6 +9,7 @@
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Cleanup_Strategies_T.h"
 #include "ace/Strategies.h"
 
 #if !defined (__ACE_INLINE__)
@@ -19,29 +20,9 @@ ACE_RCSID(ace, Caching_Utility_T, "$Id$")
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                 int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Pair_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
 ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                    ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                     double purge_percent)
 {
   // Check that the purge_percent is non-zero.
@@ -76,9 +57,9 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac
       if (key_to_remove == 0)
         return 0;
 
-      if (this->cleanup_strategy_->cleanup (container,
-                                            key_to_remove,
-                                            value_to_remove) == -1)
+      if (cleanup_s->cleanup (container,
+                              key_to_remove,
+                              value_to_remove) == -1)
         return -1;
 
     }
@@ -97,7 +78,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
   ATTRIBUTES min = (*iter).int_id_.second ();
   key_to_remove = &(*iter).ext_id_;
   value_to_remove = &(*iter).int_id_;
-
+  
   // The iterator moves thru the container searching for the entry
   // with the lowest ATTRIBUTES.
   for (++iter;
@@ -116,72 +97,6 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                                             int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Recyclable_Handler_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
-                                                                                                  double purge_percent)
-{
-  // Check that the purge_percent is non-zero.
-  if (purge_percent == 0)
-    return 0;
-
-  // Get the number of entries in the container.
-  size_t current_map_size = container.current_size ();
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then there is no way out but exiting. So return an error.
-  if (current_map_size <= 1)
-    return 0;
-
-  // Calculate the no of entries to remove from the cache depending
-  // upon the <purge_percent>.
-  size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5);
-
-  KEY *key_to_remove = 0;
-  VALUE *value_to_remove = 0;
-
-  for (size_t i = 0; i < entries_to_remove ; ++i)
-    {
-      this->minimum (container,
-                     key_to_remove,
-                     value_to_remove);
-
-      // Simply verifying that the key is non-zero.
-      // This is important for strategies where the minimum
-      // entry cant be found due to constraints on the type of entry
-      // to remove.
-      if (key_to_remove == 0)
-        return 0;
-
-      if (this->cleanup_strategy_->cleanup (container,
-                                            key_to_remove,
-                                            value_to_remove) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void
 ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container,
                                                                                               KEY *&key_to_remove,
@@ -204,56 +119,32 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
     {
       // If the <min> entry isnt IDLE_AND_PURGABLE continue until you reach
       // the first entry which can be purged. This is the minimum with
-      // which you will compare the rest of the purgable entries.
-      if ((*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
-          (*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE)
+      // which you will compare the rest of the purgable entries.   
+      if ((*iter).ext_id_.state () ==
+          ACE_Recyclable::IDLE_AND_PURGABLE)
         {
           if (found == 0)
             {
               min = (*iter).int_id_.second ();
-              key_to_remove = &(*iter).ext_id_;
-              value_to_remove = &(*iter).int_id_;
               found = 1;
-            }
-          else
+            }          
+          else 
             {
               // Ah! an entry with lower ATTTRIBUTES...
               if (min > (*iter).int_id_.second ())
-                {
-                  min = (*iter).int_id_.second ();
-                  key_to_remove = &(*iter).ext_id_;
-                  value_to_remove = &(*iter).int_id_;
-                }
+                min = (*iter).int_id_.second ();             
             }
+          key_to_remove = &(*iter).ext_id_;
+          value_to_remove = &(*iter).int_id_;  
         }
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                       int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Handler_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
 ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                       ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                        double purge_percent)
 {
   // Check that the purge_percent is non-zero.
@@ -281,9 +172,9 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_
                      key_to_remove,
                      value_to_remove);
 
-      if (this->cleanup_strategy_->cleanup (container,
-                                            key_to_remove,
-                                            value_to_remove) == -1)
+      if (cleanup_s->cleanup (container,
+                              key_to_remove,
+                              value_to_remove) == -1)
         return -1;
     }
 
@@ -321,32 +212,13 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimu
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                 int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Null_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
 ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                    ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                     double purge_percent)
 {
   ACE_UNUSED_ARG (container);
+  ACE_UNUSED_ARG (cleanup_s);
   ACE_UNUSED_ARG (purge_percent);
 
   return 0;
diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h
index 966bca32b9f..542aabff285 100644
--- a/ace/Caching_Utility_T.h
+++ b/ace/Caching_Utility_T.h
@@ -23,7 +23,9 @@
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Cleanup_Strategies_T.h"
+// Forward declaration
+template <class KEY, class VALUE, class CONTAINER>
+class ACE_Cleanup_Strategy;
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
 class ACE_Pair_Caching_Utility
@@ -32,52 +34,34 @@ class ACE_Pair_Caching_Utility
   //    Defines a helper class for the Caching Strategies.
   //
   // = DESCRIPTION
-  //    This class defines the methods commonly used by the different
-  //    caching strategies. For instance: clear_cache () method which
-  //    decides and purges the entry from the container.  Note: This
-  //    class helps in the caching_strategies using a container
-  //    containing entries of <KEY, ACE_Pair<VALUE, attributes>>
-  //    kind. The attributes helps in deciding the entries to be
-  //    purged. The Cleanup_Strategy is the callback class to which
-  //    the entries to be cleaned up will be delegated.
+  //    This class defines the methods commonly used by the
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class helps in the caching_strategies using a
+  //    container containing entries of <KEY, ACE_Pair<VALUE,
+  //    attributes>> kind. The attributes helps in deciding the
+  //    entries to be purged.
 public:
 
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-
-  ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                            int delete_cleanup_strategy = 0);
-
-  // Constructor.
-
-  ~ACE_Pair_Caching_Utility (void);
-  // Destructor.
-
   int clear_cache (CONTAINER &container,
+                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                    double purge_percent);
-
   // Purge entries from the <container>. The Cleanup_Strategy will do
   // the actual job of cleanup once the entries to be cleaned up are
   // decided.
 
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.
-
-  CLEANUP_STRATEGY *cleanup_strategy_;
-  // The cleanup strategy which can be used to destroy the entries of
-  // the container.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-class ACE_Recyclable_Handler_Caching_Utility
+class ACE_Recyclable_Handler_Caching_Utility : public ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>
 {
   // = TITLE
   //    Defines a helper class for the Caching Strategies.
@@ -88,42 +72,13 @@ class ACE_Recyclable_Handler_Caching_Utility
   //    decides and purges the entry from the container.  Note: This
   //    class helps in the caching_strategies using a container
   //    containing entries of <KEY, Svc_Handler> kind. The attributes
-  //    helps in deciding the entries to be purged. The
-  //    Cleanup_Strategy is the callback class to which the entries to
-  //    be cleaned up will be delegated.
-
-public:
-
-  typedef ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
-
-  ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                                          int delete_cleanup_strategy = 0);
-
-  // Constructor.
-
-  ~ACE_Recyclable_Handler_Caching_Utility (void);
-  // Destructor.
-
-  int clear_cache (CONTAINER &container,
-                   double purge_percent);
-  // Purge entries from the <container>. The Cleanup_Strategy will do
-  // the actual job of cleanup once the entries to be cleaned up are
-  // decided.
-
+  //    helps in deciding the entries to be purged.
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.
-
-  CLEANUP_STRATEGY_BASE *cleanup_strategy_;
-  // This is the default Cleanup Strategy for this utility.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -135,27 +90,17 @@ class ACE_Handler_Caching_Utility
   //    Defines a helper class for the Caching Strategies.
   //
   // = DESCRIPTION
-  //    This class defines the methods commonly used by the different
-  //    caching strategies. For instance: clear_cache () method which
-  //    decides and purges the entry from the container.  Note: This
-  //    class helps in the caching_strategies using a container
-  //    containing entries of <KEY, HANDLER> kind where the HANDLER
-  //    contains the caching attributes which help in deciding the
-  //    entries to be purged. The Cleanup_Strategy is the callback
-  //    class to which the entries to be cleaned up will be delegated.
+  //    This class defines the methods commonly used by the
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class helps in the caching_strategies using a
+  //    container containing entries of <KEY, HANDLER> kind where the
+  //    HANDLER contains the caching attributes which help in deciding
+  //    the entries to be purged.
 public:
 
-  typedef ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
-
-  ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                               int delete_cleanup_strategy = 0);
-  // Constructor.
-
-  ~ACE_Handler_Caching_Utility (void);
-  // Destructor.
-
   int clear_cache (CONTAINER &container,
+                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                    double purge_percent);
   // Purge entries from the <container>. The Cleanup_Strategy will do
   // the actual job of cleanup once the entries to be cleaned up are
@@ -163,51 +108,32 @@ public:
 
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.  This is handler
   // specific since this utility is to be used very specifically for
   // handler who have caching_attributes for server side acched
   // connection management.
-
-  CLEANUP_STRATEGY_BASE *cleanup_strategy_;
-  // The cleanup strategy which can be used to destroy the entries of
-  // the container.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
-
 };
 
 ///////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
+template <class KEY, class VALUE, class CONTAINER,  class ITERATOR, class ATTRIBUTES>
 class ACE_Null_Caching_Utility
 {
   // = TITLE
   //    Defines a dummy helper class for the Caching Strategies.
   //
   // = DESCRIPTION
-  //    This class defines the methods commonly used by the different
-  //    caching strategies. For instance: clear_cache () method which
-  //    decides and purges the entry from the container.  Note: This
-  //    class is be used with the Null_Caching_Strategy. The
-  //    Cleanup_Strategy is the callback class to which the entries to
-  //    be cleaned up will be delegated.
+  //    This class defines the methods commonly used by the
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class is be used with the Null_Caching_Strategy.
 public:
 
-  typedef ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
-
-  ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                            int delete_cleanup_strategy = 0);
-  // Constructor.
-
-  ~ACE_Null_Caching_Utility (void);
-  // Destructor.
-
   int clear_cache (CONTAINER &container,
+                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                    double purge_percent);
   // Purge entries from the <container>. The Cleanup_Strategy will do
   // the actual job of cleanup once the entries to be cleaned up are
@@ -215,20 +141,13 @@ public:
 
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.  This is handler
   // specific since this utility is to be used very specifically for
   // handler who have caching_attributes for server side acched
   // connection management.Note: Here it is a no-op.
-
-  CLEANUP_STRATEGY_BASE *cleanup_strategy_;
-  // The cleanup strategy which can be used to destroy the entries of
-  // the container.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp
index b11d68b78bd..b54db63adf3 100644
--- a/ace/Cleanup_Strategies_T.cpp
+++ b/ace/Cleanup_Strategies_T.cpp
@@ -17,12 +17,17 @@
 
 ACE_RCSID(ace, Cleanup_Strategies_T, "$Id$")
 
+template <class KEY, class VALUE, class CONTAINER>
+ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void)
+{
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                      KEY *key,
-                                                      VALUE *value)
+ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                              KEY *key, 
+                                                              VALUE *value)
 {
   ACE_UNUSED_ARG (value);
 
@@ -32,27 +37,24 @@ ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                                         KEY *key,
-                                                                         VALUE *)
+ACE_Svc_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                          KEY *key, 
+                                                          VALUE *value)
 {
-  VALUE value;
+  (value->first ())->recycler (0, 0);
 
-  if (container.unbind (*key, value) == -1)
+  (value->first ())->close ();
+  
+  if (container.unbind (*key) == -1)
     return -1;
-
-  value.first ()->recycler (0, 0);
-
-  value.first ()->close ();
-
-  return 0;
+   
+  return 0; 
 }
 
 /////////////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                              KEY *key,
+ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                              KEY *key, 
                                                               VALUE *value)
 {
   // Remove the item from cache only if the handler isnt in use.
@@ -66,15 +68,16 @@ ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &contain
     }
 
   return 0;
+
 }
 
 ////////////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                           KEY *key,
+ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                           KEY *key, 
                                                            VALUE *value)
 {
+
   ACE_UNUSED_ARG (container);
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (value);
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index 15c615a9d09..6c266ffc1c5 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -27,23 +27,51 @@ template <class KEY, class VALUE, class CONTAINER>
 class ACE_Cleanup_Strategy
 {
   // = TITLE
+  //    Defines a abstract base class which takes care of winding up
+  //    and destroying the entries in the container.
+  //
+  // = DESCRIPTION
+  //    This class is one of the ways to ensure that the cleanup
+  //    can be decoupled from other strategies which need to do it.
+  //    The cleanup method provided needs to be implemented as needed.
+  
+ public:  
+
+  // = Termination.
+
+  virtual ~ACE_Cleanup_Strategy (void);
+  
+  // = The cleanup operation.
+
+  virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value) = 0;
+  // This pure virtual method is to be used to destroy the <KEY,
+  // VALUE> entry.
+  
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER>
+class ACE_Default_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+{
+  // = TITLE
   //     Defines a default strategy to be followed for cleaning up
   //     entries from a map which is the container.
   //
   // = DESCRIPTION
-  //     By default the entry to be cleaned up is removed from the
+  //     By defualt the entry to be cleaned up is removed from the
   //     container.
 
 public:
-
+ 
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
+
 };
 
 //////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER>
-class ACE_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+class ACE_Svc_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
   // = TITLE
   //     Defines a strategy to be followed for cleaning up
@@ -56,19 +84,19 @@ class ACE_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY,
   //     the handler is recyclable.
 
 public:
-
+ 
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
+
 };
 
 //////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
   // = TITLE
   //     Defines a strategy to be followed for cleaning up
-  //     entries which are svc_handlers from a container.
+  //     entries which are svc_handlers from a container. 
   //
   // = DESCRIPTION
   //     The entry to be cleaned up is removed from the container.
@@ -78,13 +106,15 @@ class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CON
   //     attributes.
 
 public:
-
+  
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
+
 };
 
 //////////////////////////////////////////////////////////////////////
 
+
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
@@ -96,9 +126,10 @@ class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAI
   //     the effect of the Cleanup Strategy.
 
 public:
-
+ 
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The dummy cleanup method.
+
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Codeset_IBM1047.cpp b/ace/Codeset_IBM1047.cpp
index b5ea060f37c..2f80af10b8b 100644
--- a/ace/Codeset_IBM1047.cpp
+++ b/ace/Codeset_IBM1047.cpp
@@ -17,8 +17,6 @@
 //
 // ============================================================================
 
-#if defined(ACE_MVS)
-
 #include "ace/Codeset_IBM1047.h"
 
 ACE_RCSID(ace, Codeset_IBM1047, "$Id$")
@@ -237,7 +235,7 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out,
 
 // ****************************************************************
 
-char ACE_to_IBM1047[257] =
+char ACE_to_IBM1047[257] = 
 {
   "\x00\x01\x02\x03\x37\x2D\x2E\x2F\x16\x05\x25\x0B\x0C\x0D\x0E\x0F" // 00-0F
   "\x10\x11\x12\x13\x3C\x3D\x32\x26\x18\x19\x3F\x27\x22\x1D\x35\x1F" // 10-1F
@@ -257,8 +255,8 @@ char ACE_to_IBM1047[257] =
   "\xFC\x9E\xAE\x8C\xDD\xDC\x39\xFB\x80\xAF\xFD\x78\x76\xB2\x9F\xFF" // F0-FF
 };
 
-char ACE_from_IBM1047[257] =
-{
+char ACE_from_IBM1047[257] = 
+{ 
   "\x00\x01\x02\x03\xCF\x09\xD3\x7F\xD4\xD5\xC3\x0B\x0C\x0D\x0E\x0F" // 00-0F
   "\x10\x11\x12\x13\xC7\xB4\x08\xC9\x18\x19\xCC\xCD\x83\x1D\xD2\x1F" // 10-1F
   "\x81\x82\x1C\x84\x86\x0A\x17\x1B\x89\x91\x92\x95\xA2\x05\x06\x07" // 20-2F
@@ -277,4 +275,3 @@ char ACE_from_IBM1047[257] =
   "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\xB3\xF7\xF0\xFA\xA7\xFF" // F0-FF
 };
 
-#endif /* ACE_CODESET_IMB1047_H */
diff --git a/ace/Codeset_IBM1047.h b/ace/Codeset_IBM1047.h
index 1f9d19292b4..5e4aa0151bc 100644
--- a/ace/Codeset_IBM1047.h
+++ b/ace/Codeset_IBM1047.h
@@ -20,8 +20,6 @@
 #ifndef ACE_CODESET_IMB1047_H
 #define ACE_CODESET_IMB1047_H
 
-#if defined(ACE_MVS)
-
 #include "ace/CDR_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -41,8 +39,8 @@ class ACE_Export ACE_IBM1047_ISO8859 : public ACE_Char_Codeset_Translator
   // = DESCRIPTION
   //     This class performs the codeset translation:
   //
-  //     Native:        IBM_1047 (i.e. EBCDIC)
-  //     Stream:        ISO-8859 (i.e. Latin/1)
+  //     Native:	IBM_1047 (i.e. EBCDIC)
+  //     Stream:	ISO-8859 (i.e. Latin/1)
   //
 public:
   ACE_IBM1047_ISO8859 (void);
@@ -77,8 +75,8 @@ class ACE_Export ACE_ISO8859_IBM1047 : public ACE_Char_Codeset_Translator
   // = DESCRIPTION
   //     This class performs the codeset translation:
   //
-  //     Native:        ISO-8859 (i.e. Latin/1)
-  //     Stream:        IBM-1047 (i.e. EBCDIC)
+  //     Native:	ISO-8859 (i.e. Latin/1)
+  //     Stream:	IBM-1047 (i.e. EBCDIC)
   //
 public:
   ACE_ISO8859_IBM1047 (void);
@@ -105,6 +103,4 @@ public:
                                              ACE_CDR::ULong);
 };
 
-#endif /* ACE_MVS */
-
 #endif /* ACE_CODESET_IMB1047_H */
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 81e0e07e9c7..acfadb4c9b5 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -976,7 +976,7 @@ public:
   // Delegates to ACE_Double_Linked_List_Iterator.
 
 private:
-  ACE_DLList<T> *list_;
+  ACE_DLList<T> &list_;
 };
 
 template <class T>
@@ -1027,7 +1027,7 @@ public:
   // Delegates to ACE_Double_Linked_List_Iterator.
 
 private:
-  ACE_DLList<T> *list_;
+  ACE_DLList<T> &list_;
 };
 
 template <class T>
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index e39c2208bf1..b9ef057be2c 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -491,14 +491,14 @@ ACE_DLList_Iterator<T>::remove (void)
 template <class T> ACE_INLINE
 ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l)
   : ACE_Double_Linked_List_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
-    list_ (&l)
+    list_ (l)
 {
 }
 
 template <class T> ACE_INLINE void
 ACE_DLList_Iterator<T>::reset (ACE_DLList<T> &l)
 {
-  list_ = &l;
+  list_ = l;
   this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); 
 }
 
@@ -543,14 +543,14 @@ ACE_DLList_Reverse_Iterator<T>::remove (void)
 template <class T> ACE_INLINE
 ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l)
   : ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
-    list_ (&l)
+    list_ (l)
 {
 }
 
 template <class T> ACE_INLINE void
 ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l)
 {
-  list_ = &l;
+  list_ = l;
   this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l);
 }
 
diff --git a/ace/Containers_bad.i b/ace/Containers_bad.i
deleted file mode 100644
index 471a9d559d5..00000000000
--- a/ace/Containers_bad.i
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void)
-  : item_ (0),
-    next_ (0),
-    prev_ (0)
-{
-}
-
-ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void *&i,
-                                  ACE_DLList_Node *n,
-                                  ACE_DLList_Node *p)
-  : item_ (i),
-    next_ (n),
-    prev_ (p)
-{
-}
-
-ACE_INLINE
-ACE_DLList_Node::~ACE_DLList_Node (void) 
-{
-}
diff --git a/ace/DLL.cpp b/ace/DLL.cpp
index b4b5a715b21..4e4e81858df 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -21,8 +21,7 @@ ACE_DLL::ACE_DLL (int close_on_destruction)
 ACE_DLL::ACE_DLL (const char *dll_name,
                   int open_mode,
                   int close_on_destruction)
-  : handle_ (ACE_OS::dlopen (ASYS_WIDE_STRING (dll_name),
-                             open_mode)),
+  : handle_ (ACE_OS::dlopen (dll_name, open_mode)),
     close_on_destruction_ (close_on_destruction)
 {
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
@@ -77,7 +76,7 @@ ACE_DLL::open (const char *dll_filename,
     return result;
 
   // The ACE_SHLIB_HANDLE object is obtained.
-  this->handle_ = ACE_OS::dlopen (dll_pathname,
+  this->handle_ = ACE_OS::dlopen (ASYS_ONLY_MULTIBYTE_STRING (dll_pathname),
                                   open_mode);
 
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i
index 4f2dc0374ae..e048e45931d 100644
--- a/ace/Event_Handler_T.i
+++ b/ace/Event_Handler_T.i
@@ -80,7 +80,7 @@ ACE_Event_Handler_T<T>::handle_get (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_get (ACE_TYPENAME ACE_Event_Handler_T<T>::GET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_get (ACE_Event_Handler_T<T>::GET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
   this->get_handle_ = h;
@@ -94,7 +94,7 @@ ACE_Event_Handler_T<T>::handle_set (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_set (ACE_TYPENAME ACE_Event_Handler_T<T>::SET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_set (ACE_Event_Handler_T<T>::SET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_set");
   this->set_handle_ = h;
@@ -108,7 +108,7 @@ ACE_Event_Handler_T<T>::input_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::input_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::input_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::input_handler");
   this->input_handler_ = h;
@@ -122,7 +122,7 @@ ACE_Event_Handler_T<T>::output_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::output_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::output_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
   this->output_handler_ = h;
@@ -136,7 +136,7 @@ ACE_Event_Handler_T<T>::except_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::except_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::except_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
   this->except_handler_ = h;
@@ -150,7 +150,7 @@ ACE_Event_Handler_T<T>::to_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::to_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER h)
+ACE_Event_Handler_T<T>::to_handler (ACE_Event_Handler_T<T>::TO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
   this->to_handler_ = h;
@@ -164,7 +164,7 @@ ACE_Event_Handler_T<T>::cl_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::cl_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER h)
+ACE_Event_Handler_T<T>::cl_handler (ACE_Event_Handler_T<T>::CL_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
   this->cl_handler_ = h;
@@ -178,7 +178,7 @@ ACE_Event_Handler_T<T>::sig_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::sig_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER h)
+ACE_Event_Handler_T<T>::sig_handler (ACE_Event_Handler_T<T>::SIG_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
   this->sig_handler_ = h;
diff --git a/ace/Future.cpp b/ace/Future.cpp
index c38c9af1efc..eb54be3b2fa 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -5,7 +5,7 @@
 #ifndef ACE_FUTURE_CPP
 #define ACE_FUTURE_CPP
 
-#include /**/ "ace/Future.h"
+#include "ace/Future.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -49,7 +49,7 @@ ACE_Future_Rep<T>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
               "ref_count_ = %d\n",
- (int) this->ref_count_));
+              (int) this->ref_count_));
   ACE_DEBUG ((LM_INFO,"value_: \n"));
   if (this->value_)
     ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NON-NULL)\n")));
@@ -67,7 +67,11 @@ template <class T> ACE_Future_Rep<T> *
 ACE_Future_Rep<T>::create (void)
 {
   // Yes set ref count to zero.
-  return new ACE_Future_Rep<T> ();
+  ACE_Future_Rep<T> *t = 0;
+  ACE_NEW_RETURN (t,
+                  ACE_Future_Rep<T>,
+                  0);
+  return t;
 }
 
 template <class T> ACE_Future_Rep<T> *
@@ -269,7 +273,7 @@ ACE_Future<T>::ACE_Future (void)
 
 template <class T>
 ACE_Future<T>::ACE_Future (const ACE_Future<T> &r)
-  : future_rep_ (FUTURE_REP::attach (((ACE_Future<T> &) r).future_rep_))
+  : future_rep_ (FUTURE_REP::attach (( (ACE_Future<T> &) r).future_rep_))
 {
 }
 
diff --git a/ace/Future.h b/ace/Future.h
index 0273775419e..6a001c677ee 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -9,7 +9,7 @@
 // = FILENAME
 //    Future.h
 //
-// = AUTHOR (S)
+// = AUTHOR
 //    Andres Kruse <Andres.Kruse@cern.ch>,
 //    Douglas C. Schmidt <schmidt@cs.wustl.edu>,
 //    Per Andersson <Per.Andersson@hfera.ericsson.se>, and
@@ -20,9 +20,8 @@
 #ifndef ACE_FUTURE_H
 #define ACE_FUTURE_H
 
-#include /**/ "ace/Containers.h"
-#include /**/ "ace/Synch.h"
-#include /**/ "ace/Strategies_T.h"
+#include "ace/Synch.h"
+#include "ace/Strategies_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -62,9 +61,9 @@ class ACE_Future_Observer
   //     ACE_Future_Observer<T>
   //
   // = DESCRIPTION
-  //     An ACE_Future_Observer object implements an object that is
-  //     subscribed with an ACE_Future object so that it may be
-  //     notified when the value of the ACE_Future object is
+  //     An ACE_Future_Observer<T> object implements an object that is
+  //     subscribed with an ACE_Future<T> object so that it may be
+  //     notified when the value of the ACE_Future<T> object is
   //     written to by a writer thread.
   //
   //     It uses the Observer pattern
@@ -72,8 +71,8 @@ public:
   // = Destructor
   virtual ~ACE_Future_Observer (void);
 
-  virtual void update (const ACE_Future<T> &future) = 0;
-  // Called by the ACE_Future in which we are subscribed to when
+  virtual void update(const ACE_Future<T> &future) = 0;
+  // Called by the ACE_Future<T> in which we are subscribed to when
   // its value is written to.
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -98,33 +97,6 @@ class ACE_Future_Rep
 private:
   friend class ACE_Future<T>;
 
-  // Create, attach, detach and assign encapsulates the reference
-  // count handling and the object lifetime of ACE_Future_Rep<T>
-  // instances.
-
-  static ACE_Future_Rep<T> *create (void);
-  // Create a ACE_Future_Rep<T> and initialize the reference count.
-
-  static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
-  // Increase the reference count and return argument. Uses the
-  // attribute "value_ready_mutex_" to synchronize reference count
-  // updating.
-  //
-  // Precondition (rep != 0).
-
-  static void detach (ACE_Future_Rep<T> *&rep);
-  // Decreases the reference count and and deletes rep if there are no
-  // more references to rep.
-  //
-  // Precondition (rep != 0)
-
-  static void assign (ACE_Future_Rep<T> *&rep,
-                      ACE_Future_Rep<T> *new_rep);
-  // Decreases the rep's reference count and and deletes rep if there
-  // are no more references to rep. Then assigns new_rep to rep.
-  //
-  // Precondition (rep != 0 && new_rep != 0)
-
   int set (const T &r,
            ACE_Future<T> &caller);
   // Set the result value.  The specified <caller> represents the
@@ -139,8 +111,8 @@ private:
   int attach (ACE_Future_Observer<T> *observer,
                ACE_Future<T> &caller);
   // Attaches the specified observer to a subject (i.e. the
-  // <ACE_Future_Rep>).  The update method of the specified subject will
-  // be invoked with a copy of the written-to <ACE_Future> as input when
+  // ACE_Future_Rep).  The update method of the specified subject will
+  // be invoked with a copy of the written-to ACE_Future as input when
   // the result gets set.
   //
   // Returns 0 if the observer is successfully attached, 1 if the
@@ -148,13 +120,13 @@ private:
 
   int detach (ACE_Future_Observer<T> *observer);
   // Detaches the specified observer from a subject (i.e. the
-  // <ACE_Future_Rep>).  The update method of the specified subject will
-  // not be invoked when the <ACE_Future_Rep>s result gets set.  Returns
+  // ACE_Future_Rep).  The update method of the specified subject will
+  // not be invoked when the ACE_Future_Reps result gets set.  Returns
   // 1 if the specified observer was actually attached to the subject
   // prior to this call and 0 if was not.
   //
-  // Returns 0 if the observer was successfully detached, and -1 if the
-  // observer was not attached in the first place.
+  // Returns 0 if the observer was successfully detached, and -1 if the observer was
+  // not attached in the first place.
 
   operator T ();
   // Type conversion. will block forever until the result is
@@ -178,6 +150,34 @@ private:
   int ready (void);
   // Is result available?
 
+  // = Handle ref counting and object lifetime for ACE_Future_Rep<T>.
+
+  // These methods must go after the others to work around a bug with
+  // Borland's C++ Builder.
+
+  static ACE_Future_Rep<T> *create (void);
+  // Create a ACE_Future_Rep<T> and initialize the reference count.
+
+  static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
+  // Increase the reference count and return argument. Uses the
+  // attribute "value_ready_mutex_" to synchronize reference count
+  // updating.
+  //
+  // Precondition(rep != 0).
+
+  static void detach (ACE_Future_Rep<T> *&rep);
+  // Decreases the reference count and and deletes rep if there are no
+  // more references to rep.
+  //
+  // Precondition(rep != 0)
+
+  static void assign (ACE_Future_Rep<T> *&rep,
+                      ACE_Future_Rep<T> *new_rep);
+  // Decreases the rep's reference count and and deletes rep if there
+  // are no more references to rep. Then assigns new_rep to rep.
+  //
+  // Precondition(rep != 0 && new_rep != 0)
+
   T *value_;
   // Pointer to the result.
 
@@ -267,8 +267,8 @@ public:
 
   int attach (ACE_Future_Observer<T> *observer);
   // Attaches the specified observer to a subject (i.e. the
-  // <ACE_Future>).  The update method of the specified subject will be
-  // invoked with a copy of the associated <ACE_Future> as input when
+  // ACE_Future).  The update method of the specified subject will be
+  // invoked with a copy of the associated ACE_Future as input when
   // the result gets set.  If the result is already set when this
   // method gets invoked, then the update method of the specified
   // subject will be invoked immediately.
@@ -278,8 +278,8 @@ public:
 
   int detach (ACE_Future_Observer<T> *observer);
   // Detaches the specified observer from a subject (i.e. the
-  // <ACE_Future_Rep>).  The update method of the specified subject will
-  // not be invoked when the <ACE_Future_Reps> result gets set.  Returns
+  // ACE_Future_Rep).  The update method of the specified subject will
+  // not be invoked when the ACE_Future_Reps result gets set.  Returns
   // 1 if the specified observer was actually attached to the subject
   // prior to this call and 0 if was not.
   //
@@ -289,9 +289,9 @@ public:
   void dump (void) const;
   // Dump the state of an object.
 
-  ACE_Future_Rep<T> *get_rep ();
-  // Get the underlying <ACE_Future_Rep>*. Note that this method should
-  // rarely, if ever, be used and that modifying the undlerlying <ACE_Future_Rep>*
+  ACE_Future_Rep<T> *get_rep();
+  // Get the underlying ACE_Future_Rep<T>*. Note that this method should
+  // rarely, if ever, be used and that modifying the undlerlying ACE_Future_Rep<T>*
   // should be done with extreme caution.
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -304,7 +304,7 @@ private:
   void operator delete (void *);
   // Do not allow delete operator
 
-  void operator & ();
+  void operator &();
   // Do not allow address-of operator.
 
   // the ACE_Future_Rep
diff --git a/ace/Future_Node.cpp b/ace/Future_Node.cpp
new file mode 100644
index 00000000000..79c8706dc7f
--- /dev/null
+++ b/ace/Future_Node.cpp
@@ -0,0 +1,43 @@
+// Future.cpp
+// $Id$
+
+#define ACE_BUILD_DLL
+
+#ifndef ACE_FUTURE_NODE_CPP
+#define ACE_FUTURE_NODE_CPP
+
+#include "ace/OS.h"
+#include "ace/Future_Node.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+ACE_RCSID(ace, Future_Node, "$Id$")
+
+#if defined (ACE_HAS_THREADS)
+
+template <class T>
+ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (void)
+  : next_ (0),
+    prev_ (0)
+{
+}
+
+template <class T>
+ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (const ACE_Future<T> &item,
+                                                   ACE_DLList_Future_Node<T> *n,
+                                                   ACE_DLList_Future_Node<T> *p)
+: item_ (item),
+  next_ (n),
+  prev_ (p)
+{
+}
+
+template <class T>
+ACE_DLList_Future_Node<T>::~ACE_DLList_Future_Node (void)
+{
+}
+
+#endif /* ACE_HAS_THREADS */
+#endif /* ACE_FUTURE_NODE_CPP */
diff --git a/ace/Future_Node.h b/ace/Future_Node.h
new file mode 100644
index 00000000000..8590cbaccca
--- /dev/null
+++ b/ace/Future_Node.h
@@ -0,0 +1,72 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    Future_Node.h
+//
+// = AUTHOR
+//    John Tucker <jtucker@infoglide.com>
+//
+// ============================================================================
+
+#ifndef ACE_FUTURE_NODE_H
+#define ACE_FUTURE_NODE_H
+
+#include "ace/Future.h"
+#include "ace/Thread.h"
+#include "ace/Containers_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (ACE_HAS_THREADS)
+
+// Forward decl.
+template <class T> class ACE_Future_Node;
+template <class T> class ACE_DLList_Future_Node;
+
+template <class T>
+class ACE_DLList_Future_Node
+{
+  // = TITLE
+  //     Implementation of element in a ACE_Future list.
+  //     Needed for ACE_Double_Linked_List.
+
+  friend class ACE_Double_Linked_List<ACE_DLList_Future_Node>;
+  friend class ACE_Double_Linked_List_Iterator<ACE_DLList_Future_Node>;
+
+public:
+  // = Initialization
+  ACE_DLList_Future_Node (const ACE_Future<T> &future,
+                          ACE_DLList_Future_Node *n = 0,
+                          ACE_DLList_Future_Node *p = 0);
+  ~ACE_DLList_Future_Node (void);
+
+  ACE_ALLOC_HOOK_DECLARE;
+  // Declare the dynamic allocation hooks.
+
+  ACE_Future<T> item_;
+  ACE_DLList_Future_Node *next_;
+  ACE_DLList_Future_Node *prev_;
+
+protected:
+  ACE_DLList_Future_Node (void);
+};
+
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Future_Node.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Future_Node.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* ACE_HAS_THREADS */
+#endif /* ACE_FUTURE_NODE_H */
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp
index c75bb161978..d2872a530a8 100644
--- a/ace/Future_Set.cpp
+++ b/ace/Future_Set.cpp
@@ -6,13 +6,13 @@
 #ifndef ACE_FUTURE_SET_CPP
 #define ACE_FUTURE_SET_CPP
 
-#include /**/ "ace/Future_Set.h"
+#include "ace/Future_Set.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID (ace, Future_Set, "$Id$")
+ACE_RCSID(ace, Future_Set, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
@@ -56,7 +56,7 @@ ACE_Future_Set<T>::~ACE_Future_Set (void)
 template <class T> int
 ACE_Future_Set<T>::is_empty () const
 {
-  return (((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 );
+  return ( ((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 );
 }
 
 template <class T> int
@@ -71,9 +71,9 @@ ACE_Future_Set<T>::insert (ACE_Future<T> &future)
   int result = this->future_map_.bind (future_rep,
                                        future_holder);
 
-  // If a new map entry was created, then attach to the future,
-  // otherwise we were already attached to the future or some error
-  // occurred so just delete the future holder.
+  // If a new map entry was created, then attach to the future, otherwise
+  // we were already attached to the future or some error occurred so just
+  // delete the future holder.
   if ( result == 0 )
     // Attach ourself to the ACE_Futures list of observer
     future.attach (this);
@@ -87,7 +87,7 @@ template <class T> void
 ACE_Future_Set<T>::update (const ACE_Future<T> &future)
 {
   ACE_Message_Block *mb;
-  FUTURE &local_future = ACE_const_cast (ACE_Future<T> &, future);
+  FUTURE local_future = future;
 
   ACE_NEW (mb,
            ACE_Message_Block ((char *) local_future.get_rep (), 0));
@@ -103,7 +103,7 @@ ACE_Future_Set<T>::next_readable (ACE_Future<T> &future,
   if (this->is_empty ())
     return 0;
 
-  ACE_Message_Block *mb = 0;
+  ACE_Message_Block *mb;
   FUTURE_REP *future_rep = 0;
 
   // Wait for a "readable future" signal from the message queue.
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index a3187a59312..bd029009a06 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -9,7 +9,7 @@
 // = FILENAME
 //    Future_Set.h
 //
-// = AUTHOR (S)
+// = AUTHOR
 //    John Tucker <jtucker@infoglide.com>
 //
 // ============================================================================
@@ -17,10 +17,10 @@
 #ifndef ACE_FUTURE_SET_H
 #define ACE_FUTURE_SET_H
 
-#include /**/ "ace/Thread.h"
-#include /**/ "ace/Message_Queue.h"
-#include /**/ "ace/Future.h"
-#include /**/ "ace/Hash_Map_Manager.h"
+#include "ace/Thread.h"
+#include "ace/Message_Queue.h"
+#include "ace/Future.h"
+#include "ace/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,7 +33,7 @@ class ACE_Future_Set : public ACE_Future_Observer<T>
 {
   // = TITLE
   //     This class implements a mechanism which allows the values of
-  //     a collections of <ACE_Future> objects to be accessed by
+  //     a collections of ACE_Future<T> objects to be accessed by
   //     reader threads as they become available.
 public:
   // = Initialization and termination methods.
@@ -45,11 +45,11 @@ public:
   // Destructor.
 
   int is_empty (void) const;
-  // Return 1 if their are no <ACE_Future> objects left on its queue and
+  // Return 1 if their are no ACE_Future objects left on its queue and
   // 0 otherwise
 
   int insert (ACE_Future<T> &future);
-  // Enqueus the given <ACE_Future> into this objects queue when it is
+  // Enqueus the given ACE_Future into this objects queue when it is
   // readable.
   //
   // Returns 0 if the future is successfully inserted, 1 if the
@@ -59,7 +59,7 @@ public:
                      ACE_Time_Value *tv = 0);
   // Wait up to <tv> time to get the <value>.  Note that <tv> must be
   // specified in absolute time rather than relative time.); get the
-  // next <ACE_Future> that is readable.  If <tv> = 0, the will block
+  // next ACE_Future<T> that is readable.  If <tv> = 0, the will block
   // forever.
   //
   // If a readable future becomes available, then the input result
@@ -67,7 +67,7 @@ public:
   // is empty, then 0 is returned.
 
   virtual void update (const ACE_Future<T> &future);
-  // Called by the <ACE_Future> subject in which we are subscribed to
+  // Called by the ACE_Future<T> subject in which we are subscribed to
   // when its value is written to.
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -95,11 +95,11 @@ private:
 			          ACE_Null_Mutex> FUTURE_HASH_MAP;
 
   FUTURE_HASH_MAP future_map_;
-  // Map of <ACE_Futures>, subjects, which have not been written to by
+  // Map of ACE_Futures, subjects, which have not been written to by
   // client's writer thread.
 
   ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_;
-  // Message queue for notifying the reader thread of <ACE_Futures> which
+  // Message queue for notifying the reader thread of ACE_Futures which
   // have been written to by client's writer thread.
 
   int delete_queue_;
diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h
deleted file mode 100644
index a38455faa3e..00000000000
--- a/ace/Handle_Gobbler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Handle_Gobbler.h
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_HANDLE_GOBBLER_H
-#define ACE_HANDLE_GOBBLER_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Containers_T.h"
-
-class ACE_Handle_Gobbler
-{
-  // = TITLE
-  //     This class gobbles up handles.
-  //
-  // = DESCRIPTION
-  //     This is useful when we need to control the number of handles
-  //     available for a process.  This class is mostly used for
-  //     testing purposes.
-public:
-
-  inline ~ACE_Handle_Gobbler (void);
-  // Destructor.  Cleans up any remaining handles.
-
-  inline int consume_handles (size_t n_handles_to_keep_available);
-  // Handles are opened continously until the process runs out of
-  // them, and then <n_handles_to_keep_available> handles are closed
-  // (freed) thereby making them usable in the future.
-
-  inline int free_handles (size_t n_handles);
-  // Free up <n_handles>.
-
-  inline void close_remaining_handles (void);
-  // All remaining handles are closed.
-
-private:
-
-  typedef ACE_Unbounded_Set<ACE_HANDLE> HANDLE_SET;
-
-  HANDLE_SET handle_set_;
-  // The container which holds the open descriptors.
-};
-
-#include "ace/Handle_Gobbler.i"
-
-#endif /* ACE_HANDLE_GOBBLER_H */
diff --git a/ace/Handle_Gobbler.i b/ace/Handle_Gobbler.i
deleted file mode 100644
index da5a30e697d..00000000000
--- a/ace/Handle_Gobbler.i
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-inline
-ACE_Handle_Gobbler::~ACE_Handle_Gobbler (void)
-{
-  this->close_remaining_handles ();
-}
-
-inline int
-ACE_Handle_Gobbler::consume_handles (size_t n_handles_to_keep_available)
-{
-  int result = 0;
-
-  // On Win32, this style of gobbling doesn't seem to work.
-#if !defined (ACE_WIN32)
-
-  while (1)
-    {
-      ACE_HANDLE handle = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-
-      if (handle == ACE_INVALID_HANDLE)
-        {
-          if (ACE::out_of_handles (errno))
-            {
-              result = this->free_handles (n_handles_to_keep_available);
-              break;
-            }
-          else
-            {
-              result = -1;
-              break;
-            }
-        }
-
-      result = this->handle_set_.insert (handle);
-      if (result == -1)
-        break;
-    }
-
-#endif /* ACE_WIN32 */
-
-  return result;
-}
-
-inline int
-ACE_Handle_Gobbler::free_handles (size_t n_handles)
-{
-  HANDLE_SET::iterator iterator =
-    this->handle_set_.begin ();
-
-  HANDLE_SET::iterator end =
-    this->handle_set_.end ();
-
-  for (;
-       iterator != end && n_handles > 0;
-       ++iterator, --n_handles)
-    {
-      int result = ACE_OS::close (*iterator);
-      if (result != 0)
-        return result;
-    }
-
-  return 0;
-}
-
-inline void
-ACE_Handle_Gobbler::close_remaining_handles (void)
-{
-  HANDLE_SET::iterator iterator =
-    this->handle_set_.begin ();
-
-  HANDLE_SET::iterator end =
-    this->handle_set_.end ();
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      ACE_OS::close (*iterator);
-    }
-}
diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp
index 2e535816146..9abe0de904d 100644
--- a/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Hash_Cache_Map_Manager_T.cpp
@@ -22,7 +22,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Cache_Map_Manager)
 #define T_1 class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES
 #define T_2 KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES
 
-template <T_1>
+  template <T_1>
 ACE_Hash_Cache_Map_Manager<T_2>::ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
                                                              size_t size,
                                                              ACE_Allocator *alloc)
@@ -181,32 +181,6 @@ ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
 }
 
 template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
-                                       VALUE &value)
-{
-  CACHE_ENTRY *entry = 0;
-
-  int result = this->find (key,
-                           entry);
-
-  if (result != -1)
-    {
-      value = entry->int_id_.first ();
-    }
-
-  return result;
-}
-
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key)
-{
-  CACHE_ENTRY *entry = 0;
-
-  return this->find (key,
-                     entry);
-}
-
-template <T_1> int
 ACE_Hash_Cache_Map_Manager<T_2>::unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *entry)
 {
   // Remove the entry from the cache.
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index e346c36144c..cae1929c0c9 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -27,26 +27,12 @@
 // Forward declaration.
 class ACE_Allocator;
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-#define ACE_CACHE_MAP_MANAGER \
-        ACE_Cache_Map_Manager<KEY, \
-                              VALUE, \
-                              ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              CACHING_STRATEGY, \
-                              ATTRIBUTES>
-#else
-#define ACE_CACHE_MAP_MANAGER \
-        ACE_Cache_Map_Manager<KEY, \
-                              VALUE, \
-                              ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              CACHING_STRATEGY, \
-                              ATTRIBUTES>
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES>
-class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
+class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
+                                   ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                   ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                   ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                   CACHING_STRATEGY, ATTRIBUTES>
 {
   // = TITLE
   //     Defines a abstraction which will purge entries from a map.
@@ -174,7 +160,12 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
 
 protected:
 
-  typedef ACE_CACHE_MAP_MANAGER ACE_HCMM_BASE;
+  typedef ACE_Cache_Map_Manager<KEY, VALUE,
+                                ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                CACHING_STRATEGY, ATTRIBUTES>
+    ACE_HCMM_BASE;
   // Base class.
 };
 
diff --git a/ace/Hash_Cache_Map_Manager_T.i b/ace/Hash_Cache_Map_Manager_T.i
index f73e2d2aa7d..0b1b691fd2c 100644
--- a/ace/Hash_Cache_Map_Manager_T.i
+++ b/ace/Hash_Cache_Map_Manager_T.i
@@ -8,7 +8,7 @@ template <T_1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<T_2>::bind (const KEY &key,
                                        const VALUE &value)
 {
-  return ACE_HCMM_BASE::bind (key,
+  return ACE_HCMM_BASE::bind (key, 
                               value);
 }
 
@@ -16,8 +16,8 @@ template <T_1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                          const VALUE &value)
 {
-  return ACE_HCMM_BASE::rebind (key,
-                                value);
+  return ACE_HCMM_BASE::rebind (key, 
+                                value);                      
 }
 
 template <T_1> ACE_INLINE int
@@ -25,7 +25,7 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                          const VALUE &value,
                                          VALUE &old_value)
 {
-  return ACE_HCMM_BASE::rebind (key,
+  return ACE_HCMM_BASE::rebind (key, 
                                 value,
                                 old_value);
 }
@@ -51,6 +51,20 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
 }
 
 template <T_1> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
+                                       VALUE &value)
+{
+  return ACE_HCMM_BASE::find (key,
+                              value);
+}
+
+template <T_1> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key)
+{
+  return ACE_HCMM_BASE::find (key);
+}
+
+template <T_1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<T_2>::unbind (const KEY &key)
 {
   return ACE_HCMM_BASE::unbind (key);
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index fbdeb9f5666..4752511f2d5 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -75,10 +75,6 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 class ACE_Hash_Map_Reverse_Iterator_Ex;
 
 // Forward decl.
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_Hash_Map_Bucket_Iterator;
-
-// Forward decl.
 class ACE_Allocator;
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
@@ -101,25 +97,24 @@ public:
   friend class ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
   friend class ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
   friend class ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
-  friend class ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
 
-  typedef EXT_ID
+  typedef EXT_ID 
           KEY;
-  typedef INT_ID
+  typedef INT_ID 
           VALUE;
-  typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID>
+  typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID> 
           ENTRY;
 
   // = ACE-style iterator typedefs.
-  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           REVERSE_ITERATOR;
 
   // = STL-style iterator typedefs.
-  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           iterator;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           reverse_iterator;
 
   // = Initialization and termination methods.
@@ -511,77 +506,6 @@ public:
 };
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_Hash_Map_Bucket_Iterator
-{
-  // = TITLE
-  //     Forward iterator for the <ACE_Hash_Map_Manager_Ex> which only
-  //     traverses a particular bucket.  The particular bucket is
-  //     specified by the <EXT_ID> parameter specified in the
-  //     constructor.
-  //
-  // = DESCRIPTION
-  //     This class does not perform any internal locking of the
-  //     <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking
-  //     is inherently inefficient and/or error-prone within an
-  //     STL-style iterator.  If you require locking, you can
-  //     explicitly use an <ACE_Guard> or <ACE_Read_Guard> on the
-  //     <ACE_Hash_Map_Manager_Ex>'s internal lock, which is
-  //     accessible via its <mutex> method.
-  //
-  //     Note that this iterator cannot be created by calling a method
-  //     on the map, since this would require
-public:
-  // = Initialization method.
-  ACE_Hash_Map_Bucket_Iterator (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm,
-                                const EXT_ID &ext_id,
-                                int tail = 0);
-
-  // = STL styled iteration, compare, and reference functions.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
-  // Prefix advance.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
-  // Postfix advance.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
-  // Prefix reverse.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
-  // Postfix reverse.
-
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
-  // Returns a reference to the interal element <this> is pointing to.
-
-  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
-  // Returns reference the Hash_Map_Manager_Ex that is being iterated
-  // over.
-
-  int operator== (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
-  int operator!= (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
-  // Check if two iterators point to the same position
-
-protected:
-  int forward_i (void);
-  // Move forward by one element in the set.  Returns 0 when there's
-  // no more item in the set after the current items, else 1.
-
-  int reverse_i (void);
-  // Move backward by one element in the set.  Returns 0 when there's
-  // no more item in the set before the current item, else 1.
-
-  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_;
-  // Map we are iterating over.
-
-  ssize_t index_;
-  // Keeps track of how far we've advanced in the table.
-
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next_;
-  // Keeps track of how far we've advanced in a linked list in each
-  // table slot.
-};
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
 class ACE_Hash_Map_Reverse_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
 {
   // = TITLE
@@ -670,7 +594,7 @@ public:
 
   ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
   operator= (const ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base);
-  // Assignment from base
+  // Assignment from base 
 };
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
@@ -689,7 +613,7 @@ public:
 
   ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
   operator= (const ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base);
-  // Assignment from base
+  // Assignment from base 
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i
index a257b091f79..f4e86244358 100644
--- a/ace/Hash_Map_Manager_T.i
+++ b/ace/Hash_Map_Manager_T.i
@@ -437,7 +437,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Iterator_Ex)
 
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
+  template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -505,119 +505,9 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::oper
   return retv;
 }
 
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Bucket_Iterator (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm,
-                                                                                                              const EXT_ID &ext_id,
-                                                                                                              int tail)
-  : map_man_ (&mm)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Bucket_Iterator");
-
-  this->index_ = this->map_man_->hash (ext_id) % this->map_man_->total_size_;
-  this->next_ = &this->map_man_->table_[this->index_];
-
-  if (tail == 0)
-    this->forward_i ();
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
-
-  this->forward_i ();
-  return *this;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (int)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (int)");
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->forward_i ();
-  return retv;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
-
-  this->reverse_i ();
-  return *this;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (int)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (int)");
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->reverse_i ();
-  return retv;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
-
-  this->next_ = this->next_->next_;
-  return this->next_ != &this->map_man_->table_[this->index_];
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
-
-  this->next_ = this->next_->prev_;
-  return this->next_ != &this->map_man_->table_[this->index_];
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Entry<EXT_ID, INT_ID> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*");
-
-  return *this->next_;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map");
-  return *this->map_man_;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator== (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &rhs) const
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator==");
-  return this->map_man_ == rhs.map_man_
-    && this->index_ == rhs.index_
-    && this->next_ == rhs.next_;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator!= (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &rhs) const
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator!=");
-  return this->next_ != rhs.next_
-    || this->index_ != rhs.index_
-    || this->map_man_ != rhs.map_man_;
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Reverse_Iterator_Ex)
 
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
+  template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -692,7 +582,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Manager (ACE_Alloca
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Manager (size_t size,
                                                                       ACE_Allocator *alloc)
-  : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (size,
+  : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (size, 
                                                                                                alloc)
 {
 }
@@ -703,7 +593,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::equal (const EXT_ID &id1, const
   return ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>::equal (id1, id2);
 }
 
-template <class EXT_ID, class INT_ID, class ACE_LOCK> u_long
+template <class EXT_ID, class INT_ID, class ACE_LOCK> u_long 
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::hash (const EXT_ID &ext_id)
 {
   return ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>::hash (ext_id);
@@ -751,8 +641,9 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_Hash_Map_Reverse_Itera
 ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator= (const ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &rhs)
 {
   ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base = *this;
-
+  
   base = rhs;
 
   return *this;
 }
+
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index 74c3d5c0640..edd5acbac21 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -45,110 +45,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
 /* static */
 int ACE_High_Res_Timer::global_scale_factor_status_ = 0;
 
-#if defined (linux)
-// Determine the apparent CPU clock speed from /proc/cpuinfo
-ACE_UINT32
-ACE_High_Res_Timer::get_cpuinfo (void)
-{
-  ACE_UINT32 scale_factor = 1u;
-
-  // Get the BogoMIPS from /proc/cpuinfo.  It works fine on Alpha and
-  // Pentium Pro.  For other CPUs, it will be necessary to interpret
-  // the BogoMips, as described in the BogoMips mini-HOWTO.  Note that
-  // this code assumes an order to the /proc/cpuinfo contents.  The
-  // BogoMips rating had better come after CPU type and model info.
-#if !defined (__alpha__)
-  int supported = 0;
-#endif /* __alpha__ */
-
-  FILE *cpuinfo = ACE_OS::fopen ("/proc/cpuinfo", "r");
-
-  if (cpuinfo != 0)
-    {
-      char buf[128];
-
-      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nReading /proc/cpuinfo...")));
-
-      while (ACE_OS::fgets (buf, sizeof buf, cpuinfo))
-        {
-#if defined (__alpha__)
-          ACE_UINT32 whole;
-          ACE_UINT32 fractional;
-          if (::sscanf (buf,
-                        "BogoMIPS : %d.%d\n",
-                        &whole,
-                        &fractional) == 2 
-              || ::sscanf (buf,
-                           "bogomips : %d.%d\n",
-                           &whole,
-                           &fractional) == 2)
-            {
-              scale_factor = whole;
-              break;
-            }
-#else
-          double bmips = 1;
-          char arg[128];
-
-          // CPU type?
-          if (::sscanf (buf, "cpu : %s\n", arg) == 1)
-            {
-              // If this is an Alpha chip, then the BogoMips rating is
-              // usable...
-              if (ACE_OS::strncmp (arg,
-                                   "Alpha",
-                                   5) == 0)
-                {
-                  supported = 1;
-                  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" recognized Alpha chip...")));
-                }
-            }
-          // Pentium CPU model?
-          else if (supported == 0
-                   && ::sscanf (buf, "model : Pentium %s\n", arg) == 1)
-            {
-              // But if we don't have the right kind of Intel chip,
-              // just quit.
-              if (ACE_OS::strcmp (arg, "II") == 0
-                  || ACE_OS::strcmp (arg, "Pro") == 0)
-                {
-                  supported = 1;
-                  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" recognized Pentium Pro/II chip...")));
-                }
-            }
-          else if (::sscanf (buf, "bogomips : %lf\n", &bmips) == 1
-                   || ::sscanf (buf, "BogoMIPS : %lf\n", &bmips) == 1)
-            {
-              if (supported)
-                {
-                  scale_factor = (ACE_UINT32) (bmips + 0.5);
-                  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" setting the clock scale factor to %u"), scale_factor));
-                }
-#if 0
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ASYS_TEXT ("\nThe BogoMIPS metric is not supported on this platform"
-                                         "\n\tReport the results of the clock calibration and"
-                                         "\n\tthe contents of /proc/cpuinfo to the ace-users mailing list")));
-                }
-#endif /* 0 */
-              break;
-            }
-#endif /* __alpha__ */
-        }
-
-      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (done)\n")));
-
-      ACE_OS::fclose (cpuinfo);
-    }
-
-  return scale_factor;
-}
-#endif /* linux */
 
 ACE_UINT32
-ACE_High_Res_Timer::global_scale_factor (void)
+ACE_High_Res_Timer::global_scale_factor ()
 {
 #if (defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_POWERPC_TIMER) || \
      defined (ACE_HAS_ALPHA_TIMER)) && \
@@ -179,8 +78,29 @@ ACE_High_Res_Timer::global_scale_factor (void)
 
             return ACE_High_Res_Timer::global_scale_factor_;
 
-#         elif defined (linux)
-            ACE_High_Res_Timer::global_scale_factor (ACE_High_Res_Timer::get_cpuinfo ());
+#         elif defined (linux) && (__alpha__)
+            // Get the BogoMIPS from /proc.  It works fine on Alpha,
+            // only.  For other CPUs, it will be necessary to
+            // interpret the BogoMips, as described in the BogoMips
+            // mini-HOWTO.
+            FILE *cpuinfo;
+            if ((cpuinfo = ACE_OS::fopen ("/proc/cpuinfo", "r")))
+              {
+                char buf[128];
+                while (ACE_OS::fgets (buf, sizeof buf, cpuinfo))
+                  {
+                    ACE_UINT32 whole, fractional;
+                    if (::sscanf (buf, "BogoMIPS : %d.%d\n",
+                                  &whole, &fractional) == 2 ||
+                        ::sscanf (buf, "bogomips : %d.%d\n",
+                                  &whole, &fractional) == 2)
+                      {
+                        ACE_High_Res_Timer::global_scale_factor (whole);
+                        break;
+                      }
+                  }
+                ACE_OS::fclose (cpuinfo);
+              }
 #         endif /* ! ACE_WIN32 && ! (linux && __alpha__) */
 
           if (ACE_High_Res_Timer::global_scale_factor_ == 1u)
@@ -214,20 +134,14 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
 {
   const ACE_Time_Value sleep_time (0, usec);
   ACE_Stats delta_hrtime;
-  // In units of 100 usec, to avoid overflow.
-  ACE_Stats actual_sleeps; 
+  ACE_Stats actual_sleeps; /* In units of 100 usec, to avoid overflow. */
 
-  for (u_int i = 0;
-       i < iterations;
-       ++i)
+  for (u_int i = 0; i < iterations; ++i)
     {
-      const ACE_Time_Value actual_start =
-        ACE_OS::gettimeofday ();
-      const ACE_hrtime_t start =
-        ACE_OS::gethrtime ();
+      const ACE_Time_Value actual_start = ACE_OS::gettimeofday ();
+      const ACE_hrtime_t start = ACE_OS::gethrtime ();
       ACE_OS::sleep (sleep_time);
-      const ACE_hrtime_t stop =
-        ACE_OS::gethrtime ();
+      const ACE_hrtime_t stop = ACE_OS::gethrtime ();
       const ACE_Time_Value actual_delta =
         ACE_OS::gettimeofday () - actual_start;
 
@@ -348,8 +262,8 @@ void
 ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanoseconds) const
 {
   // Please do _not_ rearrange this equation.  It is carefully
-  // designed and tested to avoid overflow on machines that don't have
-  // native 64-bit ints.
+  // designed and tested to avoid overflow on machines that
+  // don't have native 64-bit ints.
   nanoseconds = (this->end_ - this->start_) * (1000u / this->global_scale_factor ());
 }
 
@@ -384,25 +298,16 @@ ACE_High_Res_Timer::print_ave (const char *str,
   if (count > 1)
     {
       ACE_hrtime_t avg_nsecs = total_nanoseconds / (ACE_UINT32) count;
-      ACE_OS::sprintf (buf,
-                       " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
-                       count,
-                       total_secs,
-                       (extra_nsecs + 500u) / 1000u,
-                       (u_long) ((avg_nsecs + 500u) / 1000u));
+      ACE_OS::sprintf (buf, " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
+             count, total_secs, (extra_nsecs + 500u) / 1000u,
+             (u_long) ((avg_nsecs + 500u) / 1000u));
     }
   else
-    ACE_OS::sprintf (buf,
-                     " total %3lu.%06lu secs\n",
-                     total_secs,
-                     (extra_nsecs + 500lu) / 1000lu);
-
-  ACE_OS::write (handle,
-                 str,
-                 ACE_OS::strlen (str));
-  ACE_OS::write (handle,
-                 buf,
-                 ACE_OS::strlen (buf));
+    ACE_OS::sprintf (buf, " total %3lu.%06lu secs\n",
+             total_secs, (extra_nsecs + 500u) / 1000u);
+
+  ACE_OS::write (handle, str, ACE_OS::strlen (str));
+  ACE_OS::write (handle, buf, ACE_OS::strlen (buf));
 }
 
 void
@@ -417,35 +322,23 @@ ACE_High_Res_Timer::print_total (const char *str,
   this->elapsed_time (total_nanoseconds);
 
   // Separate to seconds and nanoseconds.
-  u_long total_secs =
-    (u_long) (total_nanoseconds / (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
-  ACE_UINT32 extra_nsecs =
-    (ACE_UINT32) (total_nanoseconds % (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
+  u_long total_secs  = (u_long) (total_nanoseconds / (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
+  ACE_UINT32 extra_nsecs = (ACE_UINT32) (total_nanoseconds % (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
 
   char buf[100];
   if (count > 1)
     {
-      ACE_hrtime_t avg_nsecs = this->total_ / (ACE_UINT32) count;
-
-      ACE_OS::sprintf (buf, 
-                       " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
-                       count,
-                       total_secs,
-                       (extra_nsecs + 500u) / 1000u,
-                       (u_long) ((avg_nsecs + 500u) / 1000u));
+      ACE_hrtime_t avg_nsecs   = this->total_ / (ACE_UINT32) count;
+      ACE_OS::sprintf (buf, " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
+             count, total_secs, (extra_nsecs + 500u) / 1000u,
+             (u_long) ((avg_nsecs + 500u) / 1000u));
     }
   else
-    ACE_OS::sprintf (buf,
-                     " total %3lu.%06u secs\n",
-                     total_secs,
-                     (extra_nsecs + 500u) / 1000u);
-
-  ACE_OS::write (handle,
-                 str,
-                 ACE_OS::strlen (str));
-  ACE_OS::write (handle,
-                 buf,
-                 ACE_OS::strlen (buf));
+    ACE_OS::sprintf (buf, " total %3lu.%06u secs\n",
+             total_secs, (extra_nsecs + 500u) / 1000u);
+
+  ACE_OS::write (handle, str, ACE_OS::strlen (str));
+  ACE_OS::write (handle, buf, ACE_OS::strlen (buf));
 }
 #endif /* !ACE_HAS_WINCE */
 
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 4a591b56503..676e47f24cb 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -77,8 +77,8 @@ public:
   // not be set.  Careful, a <scale_factor> of 0 will cause division
   // by zero exceptions.
 
-  static ACE_UINT32 global_scale_factor (void);
-  // Returns the global_scale_factor.
+  static ACE_UINT32 global_scale_factor ();
+  // Accesses the global_scale_factor.
 
   static int get_env_global_scale_factor (const char *env = "ACE_SCALE_FACTOR");
   // Sets the global_scale_factor to the value in the <env>
@@ -135,12 +135,12 @@ public:
   // Stop incremental timing.
 
   void elapsed_time_incr (ACE_Time_Value &tv) const;
-  // Set <tv> to the number of microseconds elapsed between all calls
-  // to start_incr and stop_incr.
+  // Set <tv> to the number of microseconds elapsed between all
+  // calls to start_incr and stop_incr.
 
   void elapsed_time_incr (ACE_hrtime_t &nanoseconds) const;
-  // Set <nsec> to the number of nanoseconds elapsed between all calls
-  // to start_incr and stop_incr.
+  // Set <nsec> to the number of nanoseconds elapsed between all
+  // calls to start_incr and stop_incr.
 
 #if !defined (ACE_HAS_WINCE)
   // @@ These two functions are currently not supported on Windows CE.
@@ -182,21 +182,14 @@ public:
                             const ACE_hrtime_t hrt);
   // Converts an <hrt> to <tv> using global_scale_factor_.
 
-#if defined (linux)
-  static ACE_UINT32 get_cpuinfo (void);
-  // This is used to find out the Mhz of the machine for the scale
-  // factor.  If there are any problems getting it, we just return 1
-  // (the default).
-#endif /* defined (linux) */
-
 private:
   static ACE_hrtime_t gettime (const ACE_OS::ACE_HRTimer_Op =
                                  ACE_OS::ACE_HRTIMER_GETTIME);
-  // For internal use: gets the high-resolution time using
-  // ACE_OS::gethrtime ().  Except on platforms that require that the
-  // global_scale_factor_ be set, such as ACE_WIN32, uses the
-  // low-resolution clock if the global_scale_factor_ has not been
-  // set.
+  // For internal use:  gets the high-resolution time using
+  // ACE_OS::gethrtime ().  Except on platforms that require
+  // that the global_scale_factor_ be set, such as ACE_WIN32,
+  // uses the low-resolution clock if the global_scale_factor_
+  // has not been set.
 
   ACE_hrtime_t start_;
   // Starting time.
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index ec68fe8292d..79e12d73b34 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -1,6 +1,9 @@
 // LSOCK_Connector.cpp
 // $Id$
 
+/* Defines the format and interface for the connector side of the
+   local ACE_SOCK ACE_Stream. */
+
 #define ACE_BUILD_DLL
 #include "ace/LSOCK_Connector.h"
 
@@ -39,15 +42,9 @@ ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream,
 					  int perms,
 					  int protocol_family, 
 					  int protocol)
-  : ACE_SOCK_Connector (new_stream,
-                        remote_sap,
-                        timeout,
-			local_sap,
-                        reuse_addr,
-                        flags,
-                        perms,
-                        protocol_family,
-                        protocol)
+  : ACE_SOCK_Connector (new_stream, remote_sap, timeout,
+			local_sap, reuse_addr, flags, perms,
+			protocol_family, protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Connector::ACE_LSOCK_Connector");
   // This is necessary due to the weird inheritance relationships of
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 3b1c7201851..041e1cf1045 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -1112,8 +1112,7 @@ ACE_Token_Proxy::open (const ASYS_TCHAR *token_name,
   // We must have a name.
   if (token_name == 0)
     {
-      ACE_OS::sprintf (name, ASYS_TEXT ("token %x"),
-                       ACE_reinterpret_cast (ptr_arith_t, this));
+      ACE_OS::sprintf (name, ASYS_TEXT ("token %d"), this);
       token_name = name;
     }
 
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 84ed0583f92..1283afde735 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -730,8 +730,8 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str,
                   type = SKIP_SPRINTF;
                   abort_prog = 1;
                   exit_value = va_arg (argp, int);
-                  ACE_OS::sprintf (bp, ASYS_TEXT ("Aborting..."));
-                  // Make sure to NULL terminate this...
+                  ACE_OS::sprintf (bp, ASYS_TEXT ("")); // Make sure to
+                                                        // NUL-terminate this...
                   break;
                 case 'l':
                   ACE_OS::sprintf (bp, ASYS_TEXT ("%d"), this->linenum ());
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 94eeb04f96b..fd611eadb37 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -1,13 +1,12 @@
+// Log_Record.cpp
 // $Id$
 
 #define ACE_BUILD_DLL
 #include "ace/Log_Record.h"
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-# include "ace/streams.h"
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#include "ace/streams.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-# include "ace/Log_Record.i"
+#include "ace/Log_Record.i"
 #endif
 
 ACE_RCSID(ace, Log_Record, "$Id$")
@@ -121,14 +120,7 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name,
                             u_long verbose_flag,
                             ASYS_TCHAR *verbose_msg)
 {
-  /* 0123456789012345678901234     */
-  /* Oct 18 14:25:36.000 1989<nul> */
-  ASYS_TCHAR timestamp[26]; // Only used by VERBOSE and VERBOSE_LITE.
-
-  if (ACE_BIT_ENABLED (verbose_flag,
-                       ACE_Log_Msg::VERBOSE)
-      || ACE_BIT_ENABLED (verbose_flag,
-                          ACE_Log_Msg::VERBOSE_LITE))
+  if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE))
     {
       time_t now = this->time_stamp_.sec ();
       ASYS_TCHAR ctp[26]; // 26 is a magic number...
@@ -142,43 +134,38 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name,
       ctp[19] = '\0'; // NUL-terminate after the time.
       ctp[24] = '\0'; // NUL-terminate after the date.
 
-      ACE_OS::sprintf (timestamp,
-                       ASYS_TEXT ("%s.%03d %s"),
-                       ctp + 4,
-                       this->time_stamp_.usec () / 1000,
-                       ctp + 20);
-    }
-
-  if (ACE_BIT_ENABLED (verbose_flag,
-                       ACE_Log_Msg::VERBOSE))
-    {
 # if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
       const ASYS_TCHAR *lhost_name =  (const ASYS_TCHAR *) ((host_name == 0)
-                                                            ? ((char *) ASYS_TEXT ("<local_host>"))
-                                                            : ((char *) host_name));
+        ? ((char *) ASYS_TEXT ("<local_host>")) : ((char *) host_name));
 # else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
       const ASYS_TCHAR *lhost_name = ((host_name == 0)
-                                      ? ASYS_TEXT ("<local_host>")
-                                      : host_name);
+        ? ASYS_TEXT ("<local_host>") : host_name);
 # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+
       ACE_OS::sprintf (verbose_msg,
-                       ASYS_TEXT ("%s@%s@%d@%s@%s"),
-                       timestamp,
+                       ASYS_TEXT ("%s.%03d %s@%s@%d@%s@%s"),
+                       ctp + 4,
+                       this->time_stamp_.usec () / 1000,
+                       ctp + 20,
                        lhost_name,
                        this->pid_,
                        ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
                        this->msg_data_);
     }
   else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE))
-    ACE_OS::sprintf (verbose_msg,
-                     ASYS_TEXT ("%s@%s@%s"),
-                     timestamp,
-                     ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
-                     this->msg_data_);
+    {
+      ACE_OS::sprintf (verbose_msg,
+                       ASYS_TEXT ("%s@%s"),
+                       ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
+                       this->msg_data_);
+    }
   else
-    ACE_OS::sprintf (verbose_msg,
-                     ASYS_TEXT ("%s"),
-                     this->msg_data_);
+    {
+      ACE_OS::sprintf (verbose_msg,
+                       ASYS_TEXT ("%s"),
+                       this->msg_data_);
+    }
+
   return 0;
 }
 
@@ -239,7 +226,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
   return result;
 }
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+#if ! defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 int
 ACE_Log_Record::print (const ASYS_TCHAR *host_name,
diff --git a/ace/Makefile b/ace/Makefile
index 39035761cfa..9cfb79633d5 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -596,18 +596,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -623,6 +611,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -683,10 +676,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -701,16 +692,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -719,6 +700,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -744,10 +730,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -762,16 +746,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -780,6 +754,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
@@ -876,18 +855,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -898,6 +865,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -997,18 +969,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1021,6 +981,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -1058,10 +1023,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1076,16 +1039,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1094,6 +1047,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1152,13 +1110,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1273,10 +1224,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1291,16 +1240,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1314,6 +1253,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1360,10 +1304,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1378,16 +1320,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1396,6 +1328,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1438,18 +1375,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1458,6 +1383,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
@@ -1538,18 +1468,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1559,6 +1477,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Hash_T.cpp \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -1610,18 +1533,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1631,6 +1542,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp
 .obj/Timer_List.o .obj/Timer_List.so .shobj/Timer_List.o .shobj/Timer_List.so: Timer_List.cpp \
  $(ACE_ROOT)/ace/Timer_List.h \
@@ -1676,18 +1592,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1697,6 +1601,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_List_T.cpp
 .obj/Timer_Queue.o .obj/Timer_Queue.so .shobj/Timer_Queue.o .shobj/Timer_Queue.so: Timer_Queue.cpp \
  $(ACE_ROOT)/ace/Containers.h \
@@ -1719,10 +1628,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1737,16 +1644,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1755,6 +1652,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1806,18 +1708,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1827,6 +1717,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i
@@ -1902,18 +1797,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1924,6 +1807,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2003,18 +1891,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2030,6 +1906,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2113,10 +1994,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2131,16 +2010,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2149,6 +2018,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2289,18 +2163,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2311,11 +2173,19 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
@@ -2369,10 +2239,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2385,16 +2253,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2408,6 +2266,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2466,18 +2329,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2490,6 +2341,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -2564,18 +2420,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2588,6 +2432,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -2680,10 +2529,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2698,16 +2545,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2716,6 +2553,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2769,10 +2611,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2787,11 +2627,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2916,18 +2751,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -2937,6 +2760,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -3041,18 +2869,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3065,6 +2881,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3122,18 +2943,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3146,6 +2955,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3220,18 +3034,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3244,6 +3046,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3322,18 +3129,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3346,6 +3141,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3403,18 +3203,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3427,6 +3215,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3540,18 +3333,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3564,6 +3345,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3675,18 +3461,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -3696,6 +3470,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4665,18 +4444,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -4688,7 +4455,12 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp
 .obj/SPIPE_Addr.o .obj/SPIPE_Addr.so .shobj/SPIPE_Addr.o .shobj/SPIPE_Addr.so: SPIPE_Addr.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -5070,10 +4842,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5088,16 +4858,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5111,6 +4871,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5215,10 +4980,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5233,16 +4996,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5256,6 +5009,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5358,10 +5116,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5376,16 +5132,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5399,6 +5145,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5533,18 +5284,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -5557,6 +5296,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -5637,10 +5381,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5655,16 +5397,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5678,6 +5410,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5780,18 +5517,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -5804,6 +5529,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -5985,18 +5715,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6007,6 +5725,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6104,10 +5827,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Obstack.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6122,16 +5843,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6145,6 +5856,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6193,10 +5909,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6211,16 +5925,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6229,6 +5933,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6325,10 +6034,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6343,16 +6050,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6366,6 +6063,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6395,10 +6097,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6413,16 +6113,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6436,6 +6126,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6463,10 +6158,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6481,16 +6174,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6504,6 +6187,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6530,10 +6218,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6548,16 +6234,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6571,6 +6247,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6667,18 +6348,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6689,6 +6358,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6752,7 +6426,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
 .obj/Based_Pointer_Repository.o .obj/Based_Pointer_Repository.so .shobj/Based_Pointer_Repository.o .shobj/Based_Pointer_Repository.so: Based_Pointer_Repository.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -6762,11 +6439,9 @@ endif # GHS
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -6780,14 +6455,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -6795,7 +6462,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6848,10 +6519,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6866,16 +6535,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6889,6 +6548,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
@@ -6945,18 +6609,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6965,6 +6617,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6988,10 +6645,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7006,16 +6661,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -7029,6 +6674,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7050,10 +6700,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7068,16 +6716,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -7091,6 +6729,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7202,18 +6845,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7224,6 +6855,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7307,18 +6943,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7329,6 +6953,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7356,7 +6985,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Local_Tokens.i \
  $(ACE_ROOT)/ace/Token_Request_Reply.h \
  $(ACE_ROOT)/ace/Token_Request_Reply.i \
- $(ACE_ROOT)/ace/Remote_Tokens.i
+ $(ACE_ROOT)/ace/Remote_Tokens.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp
 .obj/Token_Collection.o .obj/Token_Collection.so .shobj/Token_Collection.o .shobj/Token_Collection.so: Token_Collection.cpp \
  $(ACE_ROOT)/ace/Token_Collection.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -7391,18 +7023,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7418,6 +7038,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7478,18 +7103,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7505,6 +7118,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7565,18 +7183,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7592,6 +7198,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7655,18 +7266,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7677,6 +7276,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7748,18 +7352,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7772,6 +7364,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -7830,10 +7427,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7848,16 +7443,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -7866,6 +7451,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7975,18 +7565,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7999,6 +7577,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -8058,10 +7641,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -8076,16 +7657,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -8094,6 +7665,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8158,10 +7734,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -8176,16 +7750,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -8194,6 +7758,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8287,10 +7856,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -8305,16 +7872,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -8323,6 +7880,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 9aa14849752..98677f3160e 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -286,7 +286,6 @@ libACE_Streams_la_SOURCES = \
         Task.cpp
 
 libACE_Memory_la_SOURCES = \
-	Based_Pointer_Repository.cpp \
         Malloc.cpp \
         Mem_Map.cpp \
         Memory_Pool.cpp \
@@ -384,7 +383,6 @@ ACE_TEMPLATE_FILES = \
         Active_Map_Manager_T.cpp \
         Asynch_Acceptor.cpp \
         Auto_Ptr.cpp \
-	Based_Pointer_T.cpp \
         Connector.cpp \
         Containers_T.cpp \
 	Cache_Map_Manager_T.cpp \
@@ -471,9 +469,6 @@ pkginclude_HEADERS = \
         Atomic_Op.i \
         Auto_Ptr.h \
         Auto_Ptr.i \
-        Based_Pointer_Repository.h \
-        Based_Pointer_T.h \
-        Based_Pointer_T.i \
         Basic_Types.h \
         Basic_Types.i \
         CDR_Stream.h \
@@ -565,6 +560,8 @@ pkginclude_HEADERS = \
         Hash_Map_Manager.i \
         Hash_Map_Manager_T.h \
         Hash_Map_Manager_T.i \
+        Hash_Purgable_Map_Manager_T.h \
+        Hash_Purgable_Map_Manager_T.i \
         High_Res_Timer.h \
         High_Res_Timer.i \
         INET_Addr.h \
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index 06ae7ecba94..1f40409661a 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -188,8 +188,6 @@ OBJFILES = \
 	$(OBJDIR)\WIN32_Proactor.obj \
 	$(OBJDIR)\XtReactor.obj
 
-RESOURCE = $(OBJDIR)\ace.res
-
 CFLAGS = $(ACE_CFLAGS)
 
 CPPDIR = .
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 6989ce2a4f6..54b2ccbe390 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -29,8 +29,8 @@ ACE_Control_Block::dump (void) const
   ACE_TRACE ("ACE_Control_Block::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_POINTER_CAST (this->name_head_)->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("freep_ = %x"), ACE_POINTER_CAST (this->freep_)));
+  this->name_head_->dump ();
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("freep_ = %x"), (void *) this->freep_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -41,31 +41,13 @@ ACE_Name_Node::ACE_Name_Node (void)
 }
 
 ACE_Name_Node::ACE_Name_Node (const char *name,
-                              char *ptr,
+                              void *ptr,
                               ACE_Name_Node *next)
   : pointer_ (ptr),
     next_ (next)
 {
   ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-  ACE_OS::strcpy (ACE_POINTER_CAST (this->name_), name);
-}
-
-ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
-{
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-  ACE_ASSERT (!"not implemented!");
-}
-
-const char *
-ACE_Name_Node::name (void) const
-{
-  return ACE_POINTER_CAST (this->name_);
-}
-
-void
-ACE_Name_Node::name (const char *)
-{
-  ACE_ASSERT (!"not implemented yet");
+  ACE_OS::strcpy (this->name_, name);
 }
 
 void
@@ -74,9 +56,9 @@ ACE_Name_Node::dump (void) const
   ACE_TRACE ("ACE_Name_Node");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("pointer = %x"), ACE_POINTER_CAST (this->pointer_)));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nnext_ = %x"), ACE_POINTER_CAST (this->next_)));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nname_ = %s"), ACE_POINTER_CAST (this->name_)));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("pointer = %x"), this->pointer_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nnext_ = %x"), this->next_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nname_ = %s"), this->name_));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -110,9 +92,9 @@ ACE_Allocator::instance (void)
           // destroy it.
           static void *allocator_instance = 0;
 
-          // Check this critical assumption.  We put it in a variable
-          // first to avoid stupid compiler warnings that the
-          // condition may always be true/false.
+          // Check this critical assumption.
+          // We put it in a variable first to avoid stupid compiler
+          // warnings that the condition may always be true/false.
 #         if !defined (ACE_NDEBUG)
           int assertion = (sizeof allocator_instance ==
                            sizeof (ACE_New_Allocator));
@@ -230,17 +212,11 @@ template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
 
 #if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Based_Pointer_Basic<ACE_Malloc_Header>;
-template class ACE_Based_Pointer_Basic<ACE_Name_Node>;
-template class ACE_Based_Pointer_Basic<char>;
 template class ACE_Based_Pointer<ACE_Malloc_Header>;
-template class ACE_Based_Pointer<ACE_Name_Node>;
+template ACE_Based_Pointer<ACE_Malloc_Header> operator+ (const ACE_Based_Pointer<ACE_Malloc_Header> &lhs, long increment);
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_Name_Node>
-#pragma instantiate ACE_Based_Pointer_Basic<char>
 #pragma instantiate ACE_Based_Pointer<ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer<ACE_Name_Node>
+#pragma instantiate ACE_Based_Pointer<ACE_Malloc_Header> operator+ (const ACE_Based_Pointer<ACE_Malloc_Header> &lhs, long increment)
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 7844a8079a3..4c78cd702f3 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -84,12 +84,11 @@ class ACE_Export ACE_Malloc_Header
   //    This is the control block header.  It's used by <ACE_Malloc>
   //    to keep track of each chunk of data when it's in the free
   //    list or in use.
+
 public:
 #if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-# define ACE_POINTER_CAST(PTR) ((PTR).addr ())
   typedef ACE_Based_Pointer<ACE_Malloc_Header> HEADER_PTR;
 #else 
-# define ACE_POINTER_CAST(PTR) ((PTR))
   typedef ACE_Malloc_Header *HEADER_PTR;
 #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
@@ -113,52 +112,22 @@ public:
 class ACE_Export ACE_Name_Node
 {
   // = TITLE
-  //    This class supports "named memory regions" within <ACE_Malloc>.
-  //
-  // = DESCRIPTION
-  //   Internally, the named memory regions are stored as a linked
-  //   list within the <Memory_Pool>.
+  //    This is stored as a linked list within the Memory_Pool
+  //    to allow "named memory chunks."
 public:
   // = Initialization methods.
-  ACE_Name_Node (const char *name,
-                 char *,
-                 ACE_Name_Node *);
-  // Constructor.
-
-  ACE_Name_Node (const ACE_Name_Node &);
-  // Copy constructor.
-
+  ACE_Name_Node (const char *name, void *, ACE_Name_Node *);
   ACE_Name_Node (void);
-  // Constructor.
-
   ~ACE_Name_Node (void);
-  // Constructor.
-
-  const char *name (void) const;
-  // Return a pointer to the name of this node.
-
-  void name (const char *);
-  // Assign a name;
-
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-  ACE_Based_Pointer_Basic<char> name_;
-  // Name of the Node.
-
-  ACE_Based_Pointer_Basic<char> pointer_;
-  // Pointer to the contents.
 
-  ACE_Based_Pointer<ACE_Name_Node> next_;
-  // Pointer to the next node in the chain.
-#else
   char *name_;
   // Name of the Node.
 
-  char *pointer_;
+  void *pointer_;
   // Pointer to the contents.
 
   ACE_Name_Node *next_;
   // Pointer to the next node in the chain.
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
   void dump (void) const;
   // Dump the state of the object.
@@ -167,19 +136,14 @@ public:
 class ACE_Export ACE_Control_Block
 {
   // = TITLE
-  //    This information is stored in memory allocated by the <Memory_Pool>.
+  //    This information is stored in memory allocated by the MEMORY_POOL.
   //
   // = DESCRIPTION
   //    This class should be local to class ACE_Malloc, but some older
   //    C++ compilers don't like nested classes in templates...
 public:
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-  ACE_Based_Pointer<ACE_Name_Node> name_head_;
-  // Head of the linked list of Name Nodes.
-#else
   ACE_Name_Node *name_head_;
   // Head of the linked list of Name Nodes.
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
   ACE_Malloc_Header::HEADER_PTR freep_;
   // Current head of the freelist.
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 8d3ba28d10f..946e026b256 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -101,18 +101,17 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::print_stats (void) const
     return;
   this->cb_ptr_->malloc_stats_.dump ();
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) contents of freelist:\n")));
+              ASYS_TEXT (" (%P|%t) contents of freelist:\n")));
 
-  for (ACE_Malloc_Header *currp = ACE_POINTER_CAST (this->cb_ptr_->freep_->s_.next_block_);
+  for (ACE_Malloc_Header::HEADER_PTR currp = this->cb_ptr_->freep_->s_.next_block_;
        ;
-       currp = ACE_POINTER_CAST (currp->s_.next_block_))
+       currp = currp->s_.next_block_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) ptr = %u, ACE_Malloc_Header units = %d, byte units = %d\n"),
-                  currp,
-                  currp->s_.size_,
+                  ASYS_TEXT (" (%P|%t) ptr = %u, ACE_Malloc_Header units = %d, byte units = %d\n"),
+                  currp, currp->s_.size_,
                   currp->s_.size_ * sizeof (ACE_Malloc_Header)));
-      if (currp == ACE_POINTER_CAST (this->cb_ptr_->freep_))
+      if (currp == this->cb_ptr_->freep_)
         break;
     }
 }
@@ -151,12 +150,12 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
                                      first_time);
   if (this->cb_ptr_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
+                       ASYS_TEXT (" (%P|%t) %p\n"),
                        ASYS_TEXT ("init_acquire failed")),
                       -1);
   else if (first_time)
     {
-      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) first time in, control block = %u\n"), this->cb_ptr_));
+      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) first time in, control block = %u\n"), this->cb_ptr_));
 
 #if defined (ACE_HAS_MALLOC_STATS)
       // Call the constructor on the ACE_LOCK, using the placement
@@ -164,30 +163,23 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
       new ((void *) &this->cb_ptr_->malloc_stats_) ACE_Malloc_Stats;
 #endif /* ACE_HAS_MALLOC_STATS */
 
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
       // Initialize the freelist pointer to point to the dummy
-      // <ACE_Malloc_Header>.
-      new ((void *) &this->cb_ptr_->freep_) ACE_Malloc_Header::HEADER_PTR (&this->cb_ptr_->base_);
-      new ((void *) &this->cb_ptr_->name_head_) ACE_Based_Pointer<ACE_Name_Node>;
-#else
-      // Initialize the freelist pointer to point to the dummy
-      // <ACE_Malloc_Header>.
+      // ACE_Malloc_Header.
       this->cb_ptr_->freep_ = &this->cb_ptr_->base_;
-      // initialize the name list to 0
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
-      this->cb_ptr_->name_head_ = (ACE_Name_Node *) 0;
-
-      // Initialize the dummy <ACE_Malloc_Header> to point to itself.
+      // Initialize the dummy ACE_Malloc_Header to point to itself.
       this->cb_ptr_->freep_->s_.size_ = 0;
-      this->cb_ptr_->freep_->s_.next_block_ = ACE_POINTER_CAST (this->cb_ptr_->freep_);
+      this->cb_ptr_->freep_->s_.next_block_ = this->cb_ptr_->freep_;
+
+      // initialize the name list to 0
+      this->cb_ptr_->name_head_ = 0;
 
       if (rounded_bytes > (sizeof *this->cb_ptr_ + sizeof (ACE_Malloc_Header)))
         {
           // If we've got any extra space at the end of the control
           // block, then skip past the dummy ACE_Malloc_Header to
           // point at the first free block.
-          ACE_Malloc_Header *p = ACE_POINTER_CAST (this->cb_ptr_->freep_) + 1;
+          ACE_Malloc_Header::HEADER_PTR p (this->cb_ptr_->freep_ + 1);
 
           // Why aC++ in 64-bit mode can't grok this, I have no
           // idea... but it ends up with an extra bit set which makes
@@ -205,10 +197,12 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
           AMS (++this->cb_ptr_->malloc_stats_.nblocks_);
           AMS (++this->cb_ptr_->malloc_stats_.ninuse_);
 
+          // Skip over the ACE_Malloc_Header when returning pointer.
+          ACE_Malloc_Header::HEADER_PTR tmp (p + 1);
           // Insert the newly allocated chunk of memory into the free
-          // list.  Skip over the ACE_Malloc_Header when returning
-          // pointer.
-          this->shared_free (p + 1);
+          // list.  Note that this triggers operator void *() if we're
+          // using the ACE_POSITION_INDEPENDENT_MALLOC configuration.
+          this->shared_free ((void *) tmp);
         }
     }
   return 0;
@@ -223,7 +217,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name)
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc");
   if (this->open () == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("%p"),
                 ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc")));
 }
 
@@ -271,7 +265,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::remove (void)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::remove");
-  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) destroying ACE_Malloc\n")));
+  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) destroying ACE_Malloc\n")));
   int result = 0;
 
 #if defined (ACE_HAS_MALLOC_STATS)
@@ -304,20 +298,20 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
 
   // Begin the search starting at the place in the freelist where the
   // last block was found.
-  ACE_Malloc_Header *prevp = ACE_POINTER_CAST (this->cb_ptr_->freep_);
-  ACE_Malloc_Header *currp = ACE_POINTER_CAST (prevp->s_.next_block_);
+  ACE_Malloc_Header::HEADER_PTR prevp = this->cb_ptr_->freep_;
+  ACE_Malloc_Header::HEADER_PTR currp = prevp->s_.next_block_;
 
   // Search the freelist to locate a block of the appropriate size.
 
   for (int i = 0;
-       ; i++, prevp = currp, currp = ACE_POINTER_CAST (currp->s_.next_block_))
+       ; i++, prevp = currp, currp = currp->s_.next_block_)
     {
       if (currp->s_.size_ >= nunits) // Big enough
         {
           AMS (++this->cb_ptr_->malloc_stats_.ninuse_);
           if (currp->s_.size_ == nunits)
             // Exact size, just update the pointers.
-            prevp->s_.next_block_ = ACE_POINTER_CAST (currp->s_.next_block_);
+            prevp->s_.next_block_ = currp->s_.next_block_;
           else
             {
               // Remaining chunk is larger than requested block, so
@@ -330,9 +324,13 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
           this->cb_ptr_->freep_ = prevp;
 
           // Skip over the ACE_Malloc_Header when returning pointer.
-          return currp + 1;
+          ACE_Malloc_Header::HEADER_PTR tmp (currp + 1);
+          // Insert the newly allocated chunk of memory into the free
+          // list.  Note that this triggers operator void *() if we're
+          // using the ACE_POSITION_INDEPENDENT_MALLOC configuration.
+          return (void *) tmp;
         }
-      else if (currp == ACE_POINTER_CAST (this->cb_ptr_->freep_))
+      else if (currp == this->cb_ptr_->freep_)
         {
           // We've wrapped around freelist without finding a block.
           // Therefore, we need to ask the memory pool for a new chunk
@@ -340,11 +338,9 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
 
           size_t chunk_bytes = 0;
 
-          currp = (ACE_Malloc_Header *)
-            this->memory_pool_.acquire (nunits * sizeof (ACE_Malloc_Header),
-                                        chunk_bytes);
-
-          if (currp != 0)
+          if ((currp = (ACE_Malloc_Header *)
+               this->memory_pool_.acquire (nunits * sizeof (ACE_Malloc_Header),
+                                           chunk_bytes)) != 0)
             {
               AMS (++this->cb_ptr_->malloc_stats_.nblocks_);
               AMS (++this->cb_ptr_->malloc_stats_.nchunks_);
@@ -353,15 +349,17 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
               // Compute the chunk size in ACE_Malloc_Header units.
               currp->s_.size_ = chunk_bytes / sizeof (ACE_Malloc_Header);
 
-              // Insert the newly allocated chunk of memory into the
-              // free list.  Skip over the ACE_Malloc_Header when
-              // returning pointer.
-              this->shared_free (currp + 1);
-              currp = ACE_POINTER_CAST (this->cb_ptr_->freep_);
+              // Skip over the ACE_Malloc_Header when returning pointer.
+              ACE_Malloc_Header::HEADER_PTR tmp (currp + 1);
+              // Insert the newly allocated chunk of memory into the free
+              // list.  Note that this triggers operator void *() if we're
+              // using the ACE_POSITION_INDEPENDENT_MALLOC configuration.
+              this->shared_free ((void *) tmp);
+              currp = this->cb_ptr_->freep_;
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("(%P|%t) %p\n"),
+                               ASYS_TEXT (" (%P|%t) %p\n"),
                                ASYS_TEXT ("malloc")),
                               0);
         }
@@ -405,38 +403,37 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_free (void *ap)
     return;
 
   // Adjust AP to point to the block ACE_Malloc_Header
-  ACE_Malloc_Header *blockp = (ACE_Malloc_Header *) ap - 1;
-  ACE_Malloc_Header *currp = ACE_POINTER_CAST (this->cb_ptr_->freep_);
+  ACE_Malloc_Header::HEADER_PTR blockp ((ACE_Malloc_Header *) ap - 1);
+  ACE_Malloc_Header::HEADER_PTR currp = this->cb_ptr_->freep_;
 
   // Search until we find the location where the blocks belongs.  Note
   // that addresses are kept in sorted order.
 
   for (;
-       blockp <= currp || blockp >= ACE_POINTER_CAST (currp->s_.next_block_);
-       currp = ACE_POINTER_CAST (currp->s_.next_block_))
+       blockp <= currp || blockp >= currp->s_.next_block_;
+       currp = currp->s_.next_block_)
     {
-      if (currp >= ACE_POINTER_CAST (currp->s_.next_block_)
-          && (blockp > currp || blockp < ACE_POINTER_CAST (currp->s_.next_block_)))
-        // Freed block at the start or the end of the memory pool.
+      if (currp >= currp->s_.next_block_
+          && (blockp > currp || blockp < currp->s_.next_block_))
+        // Freed block at the start or the end of the memory pool
         break;
     }
 
-  // Join to upper neighbor.
-  if (blockp + blockp->s_.size_ == ACE_POINTER_CAST (currp->s_.next_block_))
+  // Join to upper neighbor
+  if (blockp + blockp->s_.size_ == currp->s_.next_block_)
     {
       AMS (--this->cb_ptr_->malloc_stats_.nblocks_);
       blockp->s_.size_ += currp->s_.next_block_->s_.size_;
-      blockp->s_.next_block_ = ACE_POINTER_CAST (currp->s_.next_block_->s_.next_block_);
+      blockp->s_.next_block_ = currp->s_.next_block_->s_.next_block_;
     }
   else
-    blockp->s_.next_block_ = ACE_POINTER_CAST (currp->s_.next_block_);
+    blockp->s_.next_block_ = currp->s_.next_block_;
 
-  // Join to lower neighbor.
-  if (currp + currp->s_.size_ == blockp) 
+  if (currp + currp->s_.size_ == blockp) // Join to lower neighbor
     {
       AMS (--this->cb_ptr_->malloc_stats_.nblocks_);
       currp->s_.size_ += blockp->s_.size_;
-      currp->s_.next_block_ = ACE_POINTER_CAST (blockp->s_.next_block_);
+      currp->s_.next_block_ = blockp->s_.next_block_;
     }
   else
     currp->s_.next_block_ = blockp;
@@ -455,10 +452,10 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_find (const char *name)
   if (this->cb_ptr_ == 0)
     return 0;
 
-  for (ACE_Name_Node *node = ACE_POINTER_CAST (this->cb_ptr_->name_head_);
+  for (ACE_Name_Node *node = this->cb_ptr_->name_head_;
        node != 0;
-       node = ACE_POINTER_CAST (node->next_))
-    if (ACE_OS::strcmp (node->name (),
+       node = node->next_)
+    if (ACE_OS::strcmp (node->name_,
                         name) == 0)
       return node;
 
@@ -473,31 +470,28 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind (const char *name,
     return -1;
 
   // Combine the two allocations into one to avoid overhead...
-  ACE_Name_Node *new_node = 0;
+  ACE_Name_Node *new_node;
 
   ACE_ALLOCATOR_RETURN (new_node,
                         (ACE_Name_Node *)
                         this->shared_malloc (sizeof (ACE_Name_Node) + ACE_OS::strlen (name) + 1),
                         -1);
 
-  // This is a clever trick that skips over the <ACE_Name_Node> chunk
-  // and points to where the string name goes.
+  // This is a clever trick ;-)
   new_node->name_ = (char *) (new_node + 1);
 
   // Insert new node at the head of the list.  Note that (new_node) is
   // *not* a cast, it's operator placement new.
   ACE_NEW_RETURN (this->cb_ptr_->name_head_,
-                  (new_node) ACE_Name_Node (name,
-                                            ACE_reinterpret_cast (char *,
-                                                                  pointer),
-                                            ACE_POINTER_CAST (this->cb_ptr_->name_head_)),
+                  (new_node) ACE_Name_Node (name, pointer,
+                                            this->cb_ptr_->name_head_),
                   -1);
   return 0;
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::trybind (const char *name,
-                                               void *&pointer)
+                                     void *&pointer)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::trybind");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -509,16 +503,15 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::trybind (const char *name,
   else
     {
       // Found it, so return a copy of the current entry.
-      pointer = ACE_reinterpret_cast (void *,
-                                      ACE_POINTER_CAST (node->pointer_));
+      pointer = node->pointer_;
       return 1;
     }
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::bind (const char *name,
-                                            void *pointer,
-                                            int duplicates)
+                                        void *pointer,
+                                        int duplicates)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::bind");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -535,8 +528,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::bind (const char *name,
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find (const char *name,
-                                            void *&pointer)
+ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find (const char *name, void *&pointer)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find");
 
@@ -548,8 +540,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find (const char *name,
     return -1;
   else
     {
-      pointer = ACE_reinterpret_cast (void *,
-                                      ACE_POINTER_CAST (node->pointer_));
+      pointer = node->pointer_;
       return 0;
     }
 }
@@ -576,10 +567,10 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::avail_chunks (size_t size) const
   // Avoid dividing by 0...
   size = size == 0 ? 1 : size;
 
-  for (ACE_Malloc_Header *currp = ACE_POINTER_CAST (this->cb_ptr_->freep_->s_.next_block_);
-       currp != ACE_POINTER_CAST (this->cb_ptr_->freep_);
-       currp = ACE_POINTER_CAST (currp->s_.next_block_))
-    // Calculate how many will fit in this block.
+  for (ACE_Malloc_Header::HEADER_PTR currp = this->cb_ptr_->freep_->s_.next_block_;
+       currp != this->cb_ptr_->freep_;
+       currp = currp->s_.next_block_)
+    // calculate how many will fit in this block.
     if (currp->s_.size_ * sizeof (ACE_Malloc_Header) >= size)
       count += currp->s_.size_ * sizeof (ACE_Malloc_Header) / size;
 
@@ -606,18 +597,18 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::unbind (const char *name, void *&pointer)
 
   ACE_Name_Node *prev = 0;
 
-  for (ACE_Name_Node *curr = ACE_POINTER_CAST (this->cb_ptr_->name_head_);
+  for (ACE_Name_Node *curr = this->cb_ptr_->name_head_;
        curr != 0;
-       curr = ACE_POINTER_CAST (curr->next_))
+       curr = curr->next_)
     {
-      if (ACE_OS::strcmp (curr->name (), name) == 0)
+      if (ACE_OS::strcmp (curr->name_, name) == 0)
         {
-          pointer = ACE_POINTER_CAST (curr->pointer_);
+          pointer = curr->pointer_;
 
           if (prev == 0)
-            this->cb_ptr_->name_head_ = ACE_POINTER_CAST (curr->next_);
+            this->cb_ptr_->name_head_ = curr->next_;
           else
-            prev->next_ = ACE_POINTER_CAST (curr->next_);
+            prev->next_ = curr->next_;
 
           // This will free up both the node and the name due to our
           // clever trick in <bind>!
@@ -663,10 +654,9 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_Iterator (ACE_Malloc<A
 {
   ACE_TRACE ("ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_Iterator");
   // Cheap trick to make code simple.
-  // @@ Doug, this looks like trouble...
   ACE_Name_Node temp;
   this->curr_ = &temp;
-  this->curr_->next_ = ACE_POINTER_CAST (malloc_.cb_ptr_->name_head_);
+  this->curr_->next_ = malloc_.cb_ptr_->name_head_;
 
   this->advance ();
 }
@@ -679,14 +669,14 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Malloc_Iterator (void)
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::next (void *&next_entry,
-                                                     const char *&name)
+                                                 char *&name)
 {
   ACE_TRACE ("ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::next");
 
   if (this->curr_ != 0)
     {
-      next_entry = ACE_POINTER_CAST (this->curr_->pointer_);
-      name = this->curr_->name ();
+      next_entry = this->curr_->pointer_;
+      name = this->curr_->name_;
       return 1;
     }
   else
@@ -700,7 +690,7 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::next (void *&next_entry)
 
   if (this->curr_ != 0)
     {
-      next_entry = ACE_POINTER_CAST (this->curr_->pointer_);
+      next_entry = this->curr_->pointer_;
       return 1;
     }
   else
@@ -720,14 +710,14 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::advance (void)
 {
   ACE_TRACE ("ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::advance");
 
-  this->curr_ = ACE_POINTER_CAST (this->curr_->next_);
+  this->curr_ = this->curr_->next_;
 
   if (this->name_ == 0)
     return this->curr_ != 0;
 
   while (this->curr_ != 0
-         && ACE_OS::strcmp (this->name_, this->curr_->name ()) != 0)
-    this->curr_ = ACE_POINTER_CAST (this->curr_->next_);
+         && ACE_OS::strcmp (this->name_, this->curr_->name_) != 0)
+    this->curr_ = this->curr_->next_;
 
   return this->curr_ != 0;
 }
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 7fba59d0436..fcfbb414ce1 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -386,8 +386,7 @@ private:
   int open (void);
   // Initialize the Malloc pool.
 
-  int shared_bind (const char *name,
-                   void *pointer);
+  int shared_bind (const char *name, void *pointer);
   // Associate <name> with <pointer>.  Assumes that locks are held by
   // callers.
 
@@ -403,14 +402,14 @@ private:
   // Deallocate memory.  Assumes that locks are held by callers.
 
   ACE_Control_Block *cb_ptr_;
-  // Pointer to the control block that is stored in memory controlled
-  // by <MEMORY_POOL>.
+  // Pointer to the control block (stored in memory controlled by
+  // MEMORY_POOL).
 
   MEMORY_POOL memory_pool_;
-  // Pool of memory used by <ACE_Malloc> to manage its freestore.
+  // Pool of memory used by ACE_Malloc
 
   ACE_LOCK lock_;
-  // Lock that ensures mutual exclusion for the <MEMORY_POOL>.
+  // Local that ensures mutual exclusion.
 };
 
 template <ACE_MEM_POOL_1, class ACE_LOCK>
@@ -439,8 +438,7 @@ public:
   int done (void) const;
   // Returns 1 when all items have been seen, else 0.
 
-  int next (void *&next_entry, 
-            const char *&name);
+  int next (void *&next_entry, char *&name);
   // Pass back the next <entry> (and the <name> associated with it) in
   // the set that hasn't yet been visited.  Returns 0 when all items
   // have been seen, else 1.
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 8f7e01fa33d..785c52b50d8 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -843,10 +843,9 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
       // want...
       this->base_addr_ = 
         ACE_OS::shmat (shmid,
-                       ACE_reinterpret_cast (char *,
-                                             this->base_addr_),
-                       0);
-      if (this->base_addr_ == ACE_reinterpret_cast (void *, -1))
+                       (char *) this->base_addr_, 0);
+
+      if (this->base_addr_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) %p, base_addr = %u\n",
                            "shmat",
@@ -861,10 +860,9 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
       // want...
       this->base_addr_ = 
         ACE_OS::shmat (shmid,
-                       ACE_reinterpret_cast (char *,
-                                             this->base_addr_),
-                       0);
-      if (this->base_addr_ == ACE_reinterpret_cast (char *, -1))
+                       (char *) this->base_addr_, 0);
+
+      if (this->base_addr_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) %p, base_addr = %u\n",
                            "shmat",
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index b251e62cd0d..01328a6655b 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -133,9 +133,6 @@ private:
 // Include the templates here.
 #include "ace/Message_Queue_T.h"
 
-// This typedef is used to get around a compiler bug in g++/vxworks.
-typedef ACE_Message_Queue<ACE_SYNCH> ACE_DEFAULT_MESSAGE_QUEUE_TYPE;
-
 #if defined (VXWORKS)
 # include /**/ <msgQLib.h>
 
@@ -153,22 +150,22 @@ class ACE_Message_Queue_Vx : public ACE_Message_Queue<ACE_NULL_SYNCH>
   //
   //     NOTE: *Many* ACE_Message_Queue features are not supported with
   //     this specialization, including:
-  //     * The two size arguments to the constructor and <open> are
+  //     * The two size arguments to the constructor and open () are
   //       interpreted differently.  The first is interpreted as the
   //       maximum number of bytes in a message.  The second is
   //       interpreted as the maximum number of messages that can be
   //       queued.
-  //     * <dequeue_head> *requires* that the ACE_Message_Block
+  //     * dequeue_head () *requires* that the ACE_Message_Block
   //       pointer argument point to an ACE_Message_Block that was
   //       allocated by the caller.  It must be big enough to support
   //       the received message, without using continutation.  The
   //       pointer argument is not modified.
   //     * Message priority.  MSG_Q_FIFO is hard-coded.
   //     * enqueue method timeouts.
-  //     * <peek_dequeue_head>.
-  //     * <ACE_Message_Queue_Iterators>.
+  //     * peek_dequeue_head ().
+  //     * ACE_Message_Queue_Iterators.
   //     * The ability to change low and high water marks after creation.
-  //     * <Message_Block> chains.  The continuation field of <ACE_Message_Block>
+  //     * Message_Block chains.  The continuation field of ACE_Message_Block
   //     *   is ignored; only the first block of a fragment chain is
   //     *   recognized.
 public:
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 46b14d8978e..e77eef128ba 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -705,53 +705,58 @@ ACE_Message_Queue<ACE_SYNCH_USE>::notify (void)
 }
 
 
-// = Initialization and termination methods.
+/////////////////////////////////////
+// class ACE_Dynamic_Message_Queue //
+/////////////////////////////////////
+
+  // = Initialization and termination methods.
 template <ACE_SYNCH_DECL>
-ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::ACE_Dynamic_Message_Queue (ACE_Dynamic_Message_Strategy & message_strategy,
-                                                                     size_t hwm,
-                                                                     size_t lwm,
-                                                                     ACE_Notification_Strategy *ns)
-  : ACE_Message_Queue<ACE_SYNCH_USE> (hwm, lwm, ns),
-    pending_head_ (0),
-    pending_tail_ (0),
-    late_head_ (0),
-    late_tail_ (0),
-    beyond_late_head_ (0),
-    beyond_late_tail_ (0),
-    message_strategy_ (message_strategy)
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::ACE_Dynamic_Message_Queue (
+                                                      ACE_Dynamic_Message_Strategy & message_strategy,
+                                                      size_t hwm,
+                                                      size_t lwm,
+                                                      ACE_Notification_Strategy *ns)
+  : ACE_Message_Queue<ACE_SYNCH_USE> (hwm, lwm, ns)
+  , pending_head_ (0)
+  , pending_tail_ (0)
+  , late_head_ (0)
+  , late_tail_ (0)
+  , beyond_late_head_ (0)
+  , beyond_late_tail_ (0)
+  , message_strategy_ (message_strategy)
 {
-  // Note, the ACE_Dynamic_Message_Queue assumes full responsibility
-  // for the passed ACE_Dynamic_Message_Strategy object, and deletes
-  // it in its own dtor
+  // note, the ACE_Dynamic_Message_Queue assumes full responsibility for the
+  // passed ACE_Dynamic_Message_Strategy object, and deletes it in its own dtor
 }
 
-// dtor: free message strategy and let base class dtor do the rest.
-
 template <ACE_SYNCH_DECL>
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::~ACE_Dynamic_Message_Queue (void)
 {
-  delete &this->message_strategy_;
+  delete &(this->message_strategy_);
 }
+// dtor: free message strategy and let base class dtor do the rest
 
 template <ACE_SYNCH_DECL> int
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&list_head,
                                                            ACE_Message_Block *&list_tail,
                                                            u_int status_flags)
 {
+  int result = 0;
+
   // start with an empty list
   list_head = 0;
   list_tail = 0;
 
-  // Get the current time
+
+  // get the current time
   ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
-  // Refresh priority status boundaries in the queue.
-  int result = this->refresh_queue (current_time);
+  // refresh priority status boundaries in the queue
+  result = this->refresh_queue (current_time);
   if (result < 0)
     return result;
 
-  if (ACE_BIT_ENABLED (status_flags,
-                       (u_int) ACE_Dynamic_Message_Strategy::PENDING)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING)
       && this->pending_head_
       && this->pending_tail_)
     {
@@ -778,8 +783,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
       this->pending_tail_ = 0;
     }
 
-  if (ACE_BIT_ENABLED (status_flags,
-                       (u_int) ACE_Dynamic_Message_Strategy::LATE)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE)
       && this->late_head_
       && this->late_tail_)
     {
@@ -809,8 +813,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
       this->late_tail_ = 0;
     }
 
-  if (ACE_BIT_ENABLED (status_flags,
-      (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE)
       && this->beyond_late_head_
       && this->beyond_late_tail_)
     {
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index bbf0a4cd182..90484d98a28 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -106,13 +106,10 @@ public:
 
   virtual int peek_dequeue_head (ACE_Message_Block *&first_item,
                                  ACE_Time_Value *timeout = 0);
-  // Retrieve the first <ACE_Message_Block> without removing it.  Note
-  // that <timeout> uses <{absolute}> time rather than <{relative}>
-  // time.  If the <timeout> elapses without receiving a message -1 is
-  // returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
-  // deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
-  // Otherwise, returns -1 on failure, else the number of items still
-  // on the queue.
+  // Retrieve the first <ACE_Message_Block> without removing it.
+  // Returns -1 on failure, else the number of items still on the
+  // queue.  Note that <timeout> uses <{absolute}> time rather than
+  // <{relative}> time.
 
   virtual int enqueue_prio (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
@@ -120,11 +117,8 @@ public:
   // accordance with its <msg_priority> (0 is lowest priority).  FIFO
   // order is maintained when messages of the same priority are
   // inserted consecutively.  Note that <timeout> uses <{absolute}>
-  // time rather than <{relative}> time.  If the <timeout> elapses
-  // without receiving a message -1 is returned and <errno> is set to
-  // <EWOULDBLOCK>.  If the queue is deactivated -1 is returned and
-  // <errno> is set to <ESHUTDOWN>.  Otherwise, returns -1 on failure,
-  // else the number of items still on the queue.
+  // time rather than <{relative}> time.  Returns -1 on failure, else
+  // the number of items still on the queue.
 
   virtual int enqueue (ACE_Message_Block *new_item,
                        ACE_Time_Value *timeout = 0);
@@ -137,35 +131,25 @@ public:
                             ACE_Time_Value *timeout = 0);
   // Enqueue an <ACE_Message_Block *> at the end of the queue.  Note
   // that <timeout> uses <{absolute}> time rather than <{relative}>
-  // time.  If the <timeout> elapses without receiving a message -1 is
-  // returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
-  // deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
-  // Otherwise, returns -1 on failure, else the number of items still
-  // on the queue.
+  // time.  Returns -1 on failure, else the number of items still on
+  // the queue.
 
   virtual int enqueue_head (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
   // Enqueue an <ACE_Message_Block *> at the head of the queue.  Note
   // that <timeout> uses <{absolute}> time rather than <{relative}>
-  // time.  If the <timeout> elapses without receiving a message -1 is
-  // returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
-  // deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
-  // Otherwise, returns -1 on failure, else the number of items still
-  // on the queue.
+  // time.  Returns -1 on failure, else the number of items still on
+  // the queue.
 
   virtual int dequeue (ACE_Message_Block *&first_item,
                        ACE_Time_Value *timeout = 0);
-  // This method is an alias for the following <dequeue_head> method.
-
+  // This method is an alias for the following method:
   virtual int dequeue_head (ACE_Message_Block *&first_item,
                             ACE_Time_Value *timeout = 0);
   // Dequeue and return the <ACE_Message_Block *> at the head of the
   // queue.  Note that <timeout> uses <{absolute}> time rather than
-  // <{relative}> time.  If the <timeout> elapses without receiving a
-  // message -1 is returned and <errno> is set to <EWOULDBLOCK>.  If
-  // the queue is deactivated -1 is returned and <errno> is set to
-  // <ESHUTDOWN>.  Otherwise, returns -1 on failure, else the number
-  // of items still on the queue.
+  // <{relative}> time.  Returns -1 on failure, else the number of
+  // items still on the queue.
 
   // = Check if queue is full/empty.
   virtual int is_full (void);
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index d2d2e8f22eb..0d133a37ba4 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -637,7 +637,7 @@ ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[])
                          "\t[-p nameserver port]\n"
                          "\t[-s database name]\n"
                          "\t[-b base address]\n"
-                         "\t[-v] (verbose) \n"
+                         "\t[-v] (verbose) \n",
                          "\t[-r] (use Win32 Registry) \n",
                          argv[0]);
         /* NOTREACHED */
diff --git a/ace/OS.cpp b/ace/OS.cpp
index f1dd9c50071..d0a6c362715 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -346,6 +346,44 @@ ACE_Time_Value::normalize (void)
     }
 }
 
+int
+ACE_Countdown_Time::start (void)
+{
+  if (this->max_wait_time_ != 0)
+    {
+      this->start_time_ = ACE_OS::gettimeofday ();
+      this->stopped_ = 0;
+    }
+  return 0;
+}
+
+int
+ACE_Countdown_Time::update (void)
+{
+  return (this->stop () == 0) && this->start ();
+}
+
+int
+ACE_Countdown_Time::stop (void)
+{
+  if (this->max_wait_time_ != 0 && this->stopped_ == 0)
+    {
+      ACE_Time_Value elapsed_time =
+        ACE_OS::gettimeofday () - this->start_time_;
+
+      if (*this->max_wait_time_ > elapsed_time)
+        *this->max_wait_time_ -= elapsed_time;
+      else
+        {
+          // Used all of timeout.
+          *this->max_wait_time_ = ACE_Time_Value::zero;
+          // errno = ETIME;
+        }
+      this->stopped_ = 1;
+    }
+  return 0;
+}
+
 ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time)
   : max_wait_time_ (max_wait_time),
     stopped_ (0)
@@ -1277,7 +1315,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
       int result = ::sched_setscheduler (0, // this process
                                          sched_params.policy (),
                                          &param) == -1 ? -1 : 0;
-#   if defined (DIGITAL_UNIX)
+#   if defined DIGITAL_UNIX
         return result == 0
           ? // Use priocntl (2) to set the process in the RT class,
             // if using an RT policy.
@@ -2010,7 +2048,7 @@ ACE_TSS_Emulation_cleanup (void *ptr)
 }
 
 void **
-ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
+ACE_TSS_Emulation::tss_base (void* ts_storage[])
 {
   // TSS Singleton implementation.
 
@@ -2025,9 +2063,9 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
           ACE_NO_HEAP_CHECK;
           if (ACE_OS::thr_keycreate (&native_tss_key_,
                                      &ACE_TSS_Emulation_cleanup) != 0)
-            {
+           {
               return 0; // Major problems, this should *never* happen!
-            }
+           }
           key_created_ = 1;
         }
     }
@@ -2044,86 +2082,42 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
   // at least on Pthreads Draft 4 platforms.
   if (old_ts_storage == 0)
     {
-      if (ts_created)
-        *ts_created = 1u;
-
       // Use the ts_storage passed as argument, if non-zero.  It is
       // possible that this has been implemented in the stack. At the
       // moment, this is unknown.  The cleanup must not do nothing.
       // If ts_storage is zero, allocate (and eventually leak) the
       // storage array.
       if (ts_storage == 0)
-        {
-          ACE_NO_HEAP_CHECK;
+      {
+        ACE_NO_HEAP_CHECK;
 
-          ACE_NEW_RETURN (ts_storage,
-                          void*[ACE_TSS_THREAD_KEYS_MAX],
-                          0);
+        ACE_NEW_RETURN (ts_storage,
+                        void*[ACE_TSS_THREAD_KEYS_MAX],
+                        0);
 
-          // Zero the entire TSS array.  Do it manually instead of
-          // using memset, for optimum speed.  Though, memset may be
-          // faster :-)
-          void **tss_base_p = ts_storage;
+        // Zero the entire TSS array.  Do it manually instead of using
+        // memset, for optimum speed.  Though, memset may be faster
+        // :-)
+        void **tss_base_p = ts_storage;
 
-          for (u_int i = 0;
-               i < ACE_TSS_THREAD_KEYS_MAX;
-               ++i)
-            *tss_base_p++ = 0;
-        }
+        for (u_int i = 0;
+             i < ACE_TSS_THREAD_KEYS_MAX;
+             ++i)
+          *tss_base_p++ = 0;
+      }
 
-       // Store the pointer in thread-specific storage.  It gets
-       // deleted via the ACE_TSS_Emulation_cleanup function when the
-       // thread terminates.
-       if (ACE_OS::thr_setspecific (native_tss_key_,
-                                    (void *) ts_storage) != 0)
+     // Store the pointer in thread-specific storage.  It gets deleted
+     // via the ACE_TSS_Emulation_cleanup function when the thread
+     // terminates.
+     if (ACE_OS::thr_setspecific (native_tss_key_,
+                                 (void *) ts_storage) != 0)
           return 0; // Major problems, this should *never* happen!
     }
-  else
-    if (ts_created)
-      ts_created = 0;
 
-  return ts_storage  ?  ts_storage  :  old_ts_storage;
+  return old_ts_storage;
 }
 #endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
-u_int
-ACE_TSS_Emulation::total_keys ()
-{
-  ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
-                        ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
-
-  return total_keys_;
-}
-
-int
-ACE_TSS_Emulation::next_key (ACE_thread_key_t &key)
-{
-  ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
-                        ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
-
-  if (total_keys_ < ACE_TSS_THREAD_KEYS_MAX)
-    {
-# if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T)
-      ACE_OS::memset (&key, 0, sizeof (ACE_thread_key_t));
-      ACE_OS::memcpy (&key, &total_keys_, sizeof (u_int));
-# else
-      key = total_keys_;
-# endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */
-
-      ++total_keys_;
-      return 0;
-    }
-  else
-    {
-      key = ACE_OS::NULL_key;
-      return -1;
-    }
-}
-
 void *
 ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
 {
@@ -2137,9 +2131,9 @@ ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
   // Zero the entire TSS array.
   void **tss_base_p = ts_storage;
   for (u_int i = 0; i < ACE_TSS_THREAD_KEYS_MAX; ++i, ++tss_base_p)
-    {
-      *tss_base_p = 0;
-    }
+  {
+    *tss_base_p = 0;
+  }
 
   return (void *) tss_base;
 #   else  /* ! ACE_PSOS */
@@ -2149,9 +2143,7 @@ ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
         // directly by the shell (without spawning a new task) after
         // another program has been run.
 
-  u_int ts_created = 0;
-  tss_base (ts_storage, &ts_created);
-  if (ts_created)
+  if (tss_base (ts_storage) == 0)
     {
 #     else  /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
       tss_base () = ts_storage;
@@ -3798,8 +3790,8 @@ ACE_OS::thr_key_detach (void *inst)
 
 void
 ACE_OS::unique_name (const void *object,
-                     LPTSTR name,
-                     size_t length)
+                  LPTSTR name,
+                  size_t length)
 {
   // The process ID will provide uniqueness between processes on the
   // same machine. The "this" pointer of the <object> will provide
@@ -3809,7 +3801,7 @@ ACE_OS::unique_name (const void *object,
   TCHAR temp_name[ACE_UNIQUE_NAME_LEN];
   ACE_OS::sprintf (temp_name,
                    ACE_TEXT ("%x%d"),
-                   ACE_reinterpret_cast (ptr_arith_t, object),
+                   object,
                    ACE_OS::getpid ());
   ACE_OS::strncpy (name,
                    temp_name,
@@ -4469,7 +4461,7 @@ spa (FUNCPTR entry, ...)
   const int ret = ::taskSpawn (argv[0],    // task name
                                100,        // task priority
                                VX_FP_TASK, // task options
-                               ACE_NEEDS_HUGE_THREAD_STACKSIZE, // stack size
+                               1000000,    // stack size
                                entry,      // entry point
                                argc,       // first argument to main ()
                                (int) argv, // second argument to main ()
@@ -5195,16 +5187,14 @@ ACE_OS::difftime (time_t t1, time_t t0)
 # endif /* ACE_LACKS_DIFFTIME */
 
 # if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+#   if defined (ACE_HAS_WINCE)
 wchar_t *
 ACE_OS::ctime (const time_t *t)
 {
-#if defined (ACE_HAS_WINCE)
   wchar_t buf[26];              // 26 is a "magic number" ;)
   return ACE_OS::ctime_r (t, buf, 26);
-#else
-  ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0);
-#endif /* ACE_HAS_WINCE */
 }
+#   endif /* ACE_HAS_WINCE */
 
 wchar_t *
 ACE_OS::ctime_r (const time_t *clock,
@@ -6335,43 +6325,31 @@ ACE_OS_Object_Manager::init (void)
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK)
           if (ACE_OS::thread_mutex_init (ACE_reinterpret_cast (
-            ACE_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_OS_MONITOR_LOCK])) != 0)
+        ACE_thread_mutex_t *,
+        ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
             ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_OS_MONITOR_LOCK")));
+                        ASYS_TEXT("%p\n"),
+                        ASYS_TEXT("ACE_OS_Object_Manager::init (1)")));
           ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
                                      ACE_TSS_CLEANUP_LOCK)
           if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_CLEANUP_LOCK])) != 0)
+        ACE_recursive_thread_mutex_t *,
+        ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) !=
+        0)
             ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_TSS_CLEANUP_LOCK")));
-#   if defined (ACE_HAS_TSS_EMULATION)
-          ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
-                                     ACE_TSS_KEY_LOCK)
-          if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_KEY_LOCK])) != 0)
-            ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_TSS_KEY_LOCK")));
-#     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+                        ASYS_TEXT("%p\n"),
+                        ASYS_TEXT("ACE_OS_Object_Manager::init (2)")));
+#   if defined (ACE_HAS_TSS_EMULATION) && \
+       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
           ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
                                      ACE_TSS_BASE_LOCK)
           if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_BASE_LOCK])) != 0)
+          ACE_recursive_thread_mutex_t *,
+          ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
             ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_TSS_BASE_LOCK")));
-#     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-#   endif /* ACE_HAS_TSS_EMULATION */
+                        ASYS_TEXT("%p\n"),
+                        ASYS_TEXT("ACE_OS_Object_Manager::init (3)")));
+#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 # endif /* ACE_MT_SAFE */
 
           // Open Winsock (no-op on other platforms).
@@ -6435,8 +6413,8 @@ ACE_OS_Object_Manager::fini (void)
         ACE_thread_mutex_t *,
         ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
           ACE_ERROR ((LM_ERROR,
-            ASYS_TEXT("%p\n"),
-            ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_OS_MONITOR_LOCK")));
+                      ASYS_TEXT("%p\n"),
+                      ASYS_TEXT("ACE_OS_Object_Manager::fini (1)")));
 #   endif /* ! __Lynx__ */
       ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t,
                                          ACE_OS_MONITOR_LOCK)
@@ -6446,39 +6424,25 @@ ACE_OS_Object_Manager::fini (void)
        ACE_recursive_thread_mutex_t *,
        ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0)
           ACE_ERROR ((LM_ERROR,
-            ASYS_TEXT("%p\n"),
-            ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_TSS_CLEANUP_LOCK")));
+                      ASYS_TEXT("%p\n"),
+                      ASYS_TEXT("ACE_OS_Object_Manager::fini (2)")));
 #   endif /* ! __Lynx__ */
       ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
                                          ACE_TSS_CLEANUP_LOCK)
-#   if defined (ACE_HAS_TSS_EMULATION)
-#     if !defined (__Lynx__)
-        // LynxOS 3.0.0 has problems with this after fork.
-        if (ACE_OS::recursive_mutex_destroy (ACE_reinterpret_cast (
-          ACE_recursive_thread_mutex_t *,
-          ACE_OS_Object_Manager::preallocated_object[
-            ACE_TSS_KEY_LOCK])) != 0)
+#   if defined (ACE_HAS_TSS_EMULATION) && \
+       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#   if !defined (__Lynx__)
+      // LynxOS 3.0.0 has problems with this after fork.
+      if (ACE_OS::recursive_mutex_destroy (ACE_reinterpret_cast (
+        ACE_recursive_thread_mutex_t *,
+        ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
           ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_TSS_KEY_LOCK")));
-#     endif /* ! __Lynx__ */
-      ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
-                                         ACE_TSS_KEY_LOCK)
-#     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-#       if !defined (__Lynx__)
-          // LynxOS 3.0.0 has problems with this after fork.
-          if (ACE_OS::recursive_mutex_destroy (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_BASE_LOCK])) != 0)
-            ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_TSS_BASE_LOCK")));
-#       endif /* ! __Lynx__ */
+                      ASYS_TEXT("%p\n"),
+                      ASYS_TEXT("ACE_OS_Object_Manager::fini (3)")));
+#   endif /* ! __Lynx__ */
       ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
                                          ACE_TSS_BASE_LOCK)
-#     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-#   endif /* ACE_HAS_TSS_EMULATION */
+#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 # endif /* ACE_MT_SAFE */
 #endif /* ! ACE_HAS_STATIC_PREALLOCATION */
     }
diff --git a/ace/OS.h b/ace/OS.h
index 1a116d4ee98..18bc743262a 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -30,28 +30,6 @@
 #define ACE_MALLOC_ALIGN ((int) sizeof (long))
 #endif /* ACE_MALLOC_ALIGN */
 
-// States of a recyclable object.
-enum ACE_Recyclable_State
-{
-  ACE_RECYCLABLE_IDLE_AND_PURGABLE,
-  // Idle and can be purged.
-
-  ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE,
-  // Idle but cannot be purged.
-
-  ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE,
-  // Can be purged, but is not idle (mostly for debugging).
-
-  ACE_RECYCLABLE_BUSY = 2,
-  // Busy (i.e., cannot be recycled or purged).
-
-  ACE_RECYCLABLE_CLOSED = 3,
-  // Closed.
-
-  ACE_RECYCLABLE_UNKNOWN = 4
-  // Unknown state.
-};
-
 // Do not change these values wantonly since GPERF depends on them..
 #define ACE_ASCII_SIZE 128
 #define ACE_EBCDIC_SIZE 256
@@ -84,111 +62,40 @@ enum ACE_Recyclable_State
 # endif /* defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) */
 
 # if defined (ACE_HAS_ANSI_CASTS)
-
 #   define ACE_sap_any_cast(TYPE)                                      reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any))
-
 #   define ACE_static_cast(TYPE, EXPR)                                 static_cast<TYPE> (EXPR)
-#   define ACE_static_cast_1_ptr(TYPE, T1, EXPR)                       static_cast<TYPE<T1> *> (EXPR)
-#   define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR)                   static_cast<TYPE<T1, T2> *> (EXPR)
-#   define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR)               static_cast<TYPE<T1, T2, T3> *> (EXPR)
-#   define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)           static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#   define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)       static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#   define ACE_static_cast_1_ref(TYPE, T1, EXPR)                       static_cast<TYPE<T1> &> (EXPR)
-#   define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR)                   static_cast<TYPE<T1, T2> &> (EXPR)
-#   define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR)               static_cast<TYPE<T1, T2, T3> &> (EXPR)
-#   define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)           static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#   define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)       static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
 #   define ACE_const_cast(TYPE, EXPR)                                  const_cast<TYPE> (EXPR)
-#   define ACE_const_cast_1_ptr(TYPE, T1, EXPR)                        const_cast<TYPE<T1> *> (EXPR)
-#   define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR)                    const_cast<TYPE<T1, T2> *> (EXPR)
-#   define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR)                const_cast<TYPE<T1, T2, T3> *> (EXPR)
-#   define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)            const_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#   define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)        const_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#   define ACE_const_cast_1_ref(TYPE, T1, EXPR)                        const_cast<TYPE<T1> &> (EXPR)
-#   define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR)                    const_cast<TYPE<T1, T2> &> (EXPR)
-#   define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR)                const_cast<TYPE<T1, T2, T3> &> (EXPR)
-#   define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)            const_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#   define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)        const_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
 #   define ACE_reinterpret_cast(TYPE, EXPR)                            reinterpret_cast<TYPE> (EXPR)
-#   define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR)                  reinterpret_cast<TYPE<T1> *> (EXPR)
-#   define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR)              reinterpret_cast<TYPE<T1, T2> *> (EXPR)
-#   define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR)          reinterpret_cast<TYPE<T1, T2, T3> *> (EXPR)
-#   define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)      reinterpret_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#   define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)  reinterpret_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#   define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR)                  reinterpret_cast<TYPE<T1> &> (EXPR)
-#   define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR)              reinterpret_cast<TYPE<T1, T2> &> (EXPR)
-#   define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR)          reinterpret_cast<TYPE<T1, T2, T3> &> (EXPR)
-#   define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)      reinterpret_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#   define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)  reinterpret_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
 #   if defined (ACE_LACKS_RTTI)
-#     define ACE_dynamic_cast(TYPE, EXPR)                              static_cast<TYPE> (EXPR)
-#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    static_cast<TYPE<T1> *> (EXPR)
-#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                static_cast<TYPE<T1, T2> *> (EXPR)
-#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            static_cast<TYPE<T1, T2, T3> *> (EXPR)
-#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    static_cast<TYPE<T1> &> (EXPR)
-#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                static_cast<TYPE<T1, T2> &> (EXPR)
-#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            static_cast<TYPE<T1, T2, T3> &> (EXPR)
-#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
+#     define ACE_dynamic_cast(TYPE, EXPR)                              static_cast< TYPE > (EXPR)
+#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    static_cast< TYPE<T1> *> (EXPR)
+#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                static_cast< TYPE<T1, T2> *> (EXPR)
+#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            static_cast< TYPE<T1, T2, T3> *> (EXPR)
+#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        static_cast< TYPE<T1, T2, T3, T4> *> (EXPR)
+#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast< TYPE<T1, T2, T3, T4, T5> *> (EXPR)
+#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    static_cast< TYPE<T1> &> (EXPR)
+#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                static_cast< TYPE<T1, T2> &> (EXPR)
+#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            static_cast< TYPE<T1, T2, T3> &> (EXPR)
+#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        static_cast< TYPE<T1, T2, T3, T4> &> (EXPR)
+#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast< TYPE<T1, T2, T3, T4, T5> &> (EXPR)
 #   else  /* ! ACE_LACKS_RTTI */
-#     define ACE_dynamic_cast(TYPE, EXPR)                              dynamic_cast<TYPE> (EXPR)
-#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    dynamic_cast<TYPE<T1> *> (EXPR)
-#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                dynamic_cast<TYPE<T1, T2> *> (EXPR)
-#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            dynamic_cast<TYPE<T1, T2, T3> *> (EXPR)
-#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    dynamic_cast<TYPE<T1> &> (EXPR)
-#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                dynamic_cast<TYPE<T1, T2> &> (EXPR)
-#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            dynamic_cast<TYPE<T1, T2, T3> &> (EXPR)
-#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
+#     define ACE_dynamic_cast(TYPE, EXPR)                              dynamic_cast< TYPE > (EXPR)
+#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    dynamic_cast< TYPE<T1> *> (EXPR)
+#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                dynamic_cast< TYPE<T1, T2> *> (EXPR)
+#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            dynamic_cast< TYPE<T1, T2, T3> *> (EXPR)
+#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast< TYPE<T1, T2, T3, T4> *> (EXPR)
+#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast< TYPE<T1, T2, T3, T4, T5> *> (EXPR)
+#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    dynamic_cast< TYPE<T1> &> (EXPR)
+#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                dynamic_cast< TYPE<T1, T2> &> (EXPR)
+#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            dynamic_cast< TYPE<T1, T2, T3> &> (EXPR)
+#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast< TYPE<T1, T2, T3, T4> &> (EXPR)
+#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast< TYPE<T1, T2, T3, T4, T5> &> (EXPR)
 #   endif /* ! ACE_LACKS_RTTI */
-
 # else
-
 #   define ACE_sap_any_cast(TYPE)                                      ((TYPE) (ACE_Addr::sap_any))
-
 #   define ACE_static_cast(TYPE, EXPR)                                 ((TYPE) (EXPR))
-#   define ACE_static_cast_1_ptr(TYPE, T1, EXPR)                       ((TYPE<T1> *) (EXPR))
-#   define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR)                   ((TYPE<T1, T2> *) (EXPR))
-#   define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR)               ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)           ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)       ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
-#   define ACE_static_cast_1_ref(TYPE, T1, EXPR)                       ((TYPE<T1> &) (EXPR))
-#   define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR)                   ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR)               ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)           ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)       ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
-
 #   define ACE_const_cast(TYPE, EXPR)                                  ((TYPE) (EXPR))
-#   define ACE_const_cast_1_ptr(TYPE, T1, EXPR)                        ((TYPE<T1> *) (EXPR))
-#   define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR)                    ((TYPE<T1, T2> *) (EXPR))
-#   define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR)                ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)            ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)        ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
-#   define ACE_const_cast_1_ref(TYPE, T1, EXPR)                        ((TYPE<T1> &) (EXPR))
-#   define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR)                    ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR)                ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)            ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)        ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
-
 #   define ACE_reinterpret_cast(TYPE, EXPR)                            ((TYPE) (EXPR))
-#   define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR)                  ((TYPE<T1> *) (EXPR))
-#   define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR)              ((TYPE<T1, T2> *) (EXPR))
-#   define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR)          ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)      ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)  ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
-#   define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR)                  ((TYPE<T1> &) (EXPR))
-#   define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR)              ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR)          ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)      ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)  ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
-
 #   define ACE_dynamic_cast(TYPE, EXPR)                                ((TYPE) (EXPR))
 #   define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                      ((TYPE<T1> *) (EXPR))
 #   define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                  ((TYPE<T1, T2> *) (EXPR))
@@ -2054,13 +1961,13 @@ struct stat
 #       define ACE_THR_PRI_OTHER_MAX ACE_PROC_PRI_OTHER_MAX
 #     endif
 #     if !defined(ACE_THR_PRI_FIFO_DEF)
-#       define ACE_THR_PRI_FIFO_DEF  ((ACE_THR_PRI_FIFO_MIN + ACE_THR_PRI_FIFO_MAX)/2)
+#       define ACE_THR_PRI_FIFO_DEF  (ACE_THR_PRI_FIFO_MIN + (ACE_THR_PRI_FIFO_MAX - ACE_THR_PRI_FIFO_MIN)/2)
 #     endif
 #     if !defined(ACE_THR_PRI_RR_DEF)
-#       define ACE_THR_PRI_RR_DEF ((ACE_THR_PRI_RR_MIN + ACE_THR_PRI_RR_MAX)/2)
+#       define ACE_THR_PRI_RR_DEF (ACE_THR_PRI_RR_MIN + (ACE_THR_PRI_RR_MAX - ACE_THR_PRI_RR_MIN)/2)
 #     endif
 #     if !defined(ACE_THR_PRI_OTHER_DEF)
-#       define ACE_THR_PRI_OTHER_DEF ((ACE_THR_PRI_OTHER_MIN + ACE_THR_PRI_OTHER_MAX)/2)
+#       define ACE_THR_PRI_OTHER_DEF (ACE_THR_PRI_OTHER_MIN + (ACE_THR_PRI_OTHER_MAX - ACE_THR_PRI_OTHER_MIN)/2)
 #     endif
 
       // Typedefs to help compatibility with Windows NT and Pthreads.
@@ -2777,14 +2684,14 @@ typedef unsigned int size_t;
 
 // Define some helpful constants.
 // Not type-safe, and signed.  For backward compatibility.
-#define ACE_ONE_SECOND_IN_MSECS 1000L
-#define ACE_ONE_SECOND_IN_USECS 1000000L
-#define ACE_ONE_SECOND_IN_NSECS 1000000000L
+#define ACE_ONE_SECOND_IN_MSECS 1000l
+#define ACE_ONE_SECOND_IN_USECS 1000000l
+#define ACE_ONE_SECOND_IN_NSECS 1000000000l
 
 // Type-safe, and unsigned.
-static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000U;
-static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000U;
-static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000U;
+static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000u;
+static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000u;
+static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000u;
 
 # if defined (ACE_HAS_SIG_MACROS)
 #   undef sigemptyset
@@ -3702,12 +3609,11 @@ extern int t_errno;
   // trouble when introducing member functions with the same name.
   // Thanks to Thilo Kielmann" <kielmann@informatik.uni-siegen.de> for
   // this fix.
+#     undef sigwait
 #     if defined  (__DECCXX_VER)
-#       undef sigwait
-        // cxx on Digital Unix 4.0 needs this declaration.  With it,
-        // ::_Psigwait () works with cxx -pthread.  g++ does _not_
-        // need it.
-        extern "C" int _Psigwait __((const sigset_t *set, int *sig));
+    // cxx on Digital Unix 4.0 needs this declaration.  With it,
+    // ::_Psigwait () works with cxx -pthread.  g++ does _not_ need it.
+    extern "C" int _Psigwait __((const sigset_t *set, int *sig));
 #     endif /* __DECCXX_VER */
 #   elif !defined (ACE_HAS_SIGWAIT)
   extern "C" int sigwait (sigset_t *set);
@@ -4193,10 +4099,6 @@ struct sigaction
 #   define ENOSYS EFAULT /* Operation not supported or unknown error. */
 # endif /* !ENOSYS */
 
-# if !defined (ENFILE)
-#   define ENFILE EMFILE /* No more socket descriptors are available. */
-# endif /* !ENOSYS */
-
 # if !defined (ENOTSUP)
 #   define ENOTSUP ENOSYS  /* Operation not supported. */
 # endif /* !ENOTSUP */
@@ -4981,10 +4883,9 @@ public:
   void ttl (int t);
 };
 
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-class ACE_Export ACE_QoS : public QOS
-#else
 class ACE_Export ACE_QoS
+#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+  : public QOS
 #endif /* ACE_HAS_WINSOCK2 */
 {
   // = TITLE
@@ -5011,10 +4912,10 @@ class ACE_Export ACE_QoS_Params
   //   enabled <ACE_OS::connect> and <ACE_OS::join_leaf> methods.
 public:
   ACE_QoS_Params (iovec *caller_data = 0,
-                  iovec *callee_data = 0,
-                  ACE_QoS *socket_qos = 0,
-                  ACE_QoS *group_socket_qos = 0,
-                  u_long flags = 0);
+                          iovec *callee_data = 0,
+                          ACE_QoS *socket_qos = 0,
+                          ACE_QoS *group_socket_qos = 0,
+                          u_long flags = 0);
   // Initialize the data members.  The <caller_data> is a pointer to
   // the user data that is to be transferred to the peer during
   // connection establishment.  The <callee_data> is a pointer to the
@@ -6654,12 +6555,10 @@ public:
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
       ACE_OS_MONITOR_LOCK,
       ACE_TSS_CLEANUP_LOCK,
-#   if defined (ACE_HAS_TSS_EMULATION)
-      ACE_TSS_KEY_LOCK,
-#     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#   if defined (ACE_HAS_TSS_EMULATION) && \
+       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
       ACE_TSS_BASE_LOCK,
-#     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-#   endif /* ACE_HAS_TSS_EMULATION */
+#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 # else
       // Without ACE_MT_SAFE, There are no preallocated objects.  Make
       // sure that the preallocated_array size is at least one by
@@ -6820,14 +6719,9 @@ public:
   // Does _not_ check for a valid key.
 
   static void *tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX]);
-  // Setup an array to be used for local TSS.  Returns the array
-  // address on success.  Returns 0 if local TSS had already been
-  // setup for this thread.  There is no corresponding tss_close ()
-  // because it is not needed.
-  // NOTE: tss_open () is called by ACE for threads that it spawns.
-  // If your application spawns threads without using ACE, and it uses
-  // ACE's TSS emulation, each of those threads should call tss_open
-  // ().  See the ace_thread_adapter () implementaiton for an example.
+  // Setup an array to be used for local TSS.  Returns the array address on
+  // success.  Returns 0 if local TSS had already been setup for this thread.
+  // There is no corresponding tss_close () because it is not needed.
 
   static void tss_close ();
   // Shutdown TSS emulation.  For use only by ACE_OS::cleanup_tss ().
@@ -6842,7 +6736,7 @@ private:
   // key (that has one) when the thread exits.
 
 #   if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-  static void **tss_base (void* ts_storage[] = 0, u_int *ts_created = 0);
+  static void **tss_base (void* ts_storage[] = 0);
   // Location of current thread's TSS array.
 #   else  /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
   static void **&tss_base ();
@@ -7653,8 +7547,7 @@ private:
 #   define ACE_INLINE_FOR_GNUC
 # endif /* ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS */
 
-# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \
-                         && ! defined (ACE_HAS_PHARLAP)
+# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE)
 typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS;
 typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS;
 typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS;
diff --git a/ace/OS.i b/ace/OS.i
index b1876068615..37c397fba89 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -72,13 +72,6 @@ typedef char *ACE_MMAP_TYPE;
 # include /**/ <xliuser.h>
 #endif /* ACE_HAS_XLI */
 
-#if defined (_M_UNIX)
-extern "C" int _dlclose (void *);
-extern "C" char *_dlerror (void);
-extern "C" void *_dlopen (const char *, int);
-extern "C" void * _dlsym (void *, const char *);
-#endif /* _M_UNIX */
-
 #if !defined (ACE_HAS_CPLUSPLUS_HEADERS)
 # include /**/ <libc.h>
 # include /**/ <osfcn.h>
@@ -4582,10 +4575,10 @@ ACE_QoS::provider_specific (const iovec &ps)
 
 ACE_INLINE
 ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data,
-                                iovec *callee_data,
-                                ACE_QoS *socket_qos,
-                                ACE_QoS *group_socket_qos,
-                                u_long flags)
+                                                iovec *callee_data,
+                                                ACE_QoS *socket_qos,
+                                                ACE_QoS *group_socket_qos,
+                                                u_long flags)
   : caller_data_ (caller_data),
     callee_data_ (callee_data),
     socket_qos_ (socket_qos),
@@ -4841,14 +4834,11 @@ ACE_OS::bind (ACE_HANDLE handle, struct sockaddr *addr, int addrlen)
 {
   ACE_TRACE ("ACE_OS::bind");
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
-  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle,
-                               (struct sockaddr_in *) addr,
+  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle,  (struct sockaddr_in *) addr,
                                (ACE_SOCKET_LEN) addrlen),
                        int, -1);
 #else /* !defined (ACE_PSOS) || defined (ACE_PSOS_DIAB_PPC) */
-  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle,
-                               addr,
-                               (ACE_SOCKET_LEN) addrlen), int, -1);
+  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1);
 #endif /* defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC) */
 }
 
@@ -4859,14 +4849,11 @@ ACE_OS::connect (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE_OS::connect");
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
-  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle,
-                                  (struct sockaddr_in *) addr,
+  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                   (ACE_SOCKET_LEN) addrlen),
                        int, -1);
 #else  /* !defined (ACE_PSOS) || defined (ACE_PSOS_DIAB_PPC) */
-  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle,
-                                  addr,
-                                  (ACE_SOCKET_LEN) addrlen), int, -1);
+  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1);
 #endif /* defined (ACE_PSOS)  && !defined (ACE_PSOS_DIAB_PPC) */
 }
 
@@ -4926,7 +4913,9 @@ ACE_OS::gethostbyname2 (const char *name, int family)
 # else
   // IPv4-only implementation
   if (family == AF_INET)
-    return ACE_OS::gethostbyname (name);
+    {
+      return ACE_OS::gethostbyname (name);
+    }
 
   ACE_NOTSUP_RETURN (0);
 # endif /* ACE_PSOS */
@@ -5009,15 +4998,16 @@ ACE_OS::recv (ACE_HANDLE handle, char *buf, int len, int flags)
 {
   ACE_TRACE ("ACE_OS::recv");
 
-  // On UNIX, a non-blocking socket with no data to receive, this
-  // system call will return EWOULDBLOCK or EAGAIN, depending on the
-  // platform.  UNIX 98 allows either errno, and they may be the same
-  // numeric value.  So to make life easier for upper ACE layers as
-  // well as application programmers, always change EAGAIN to
-  // EWOULDBLOCK.  Rather than hack the ACE_OSCALL_RETURN macro, it's
-  // handled explicitly here.  If the ACE_OSCALL macro ever changes,
-  // this function needs to be reviewed.  On Win32, the regular macros
-  // can be used, as this is not an issue.
+
+  // On UNIX, a non-blocking socket with no data to receive, this system
+  // call will return EWOULDBLOCK or EAGAIN, depending on the platform.
+  // UNIX 98 allows either errno, and they may be the same numeric value.
+  // So to make life easier for upper ACE layers as well as application
+  // programmers, always change EAGAIN to EWOULDBLOCK.  Rather than hack the
+  // ACE_OSCALL_RETURN macro, it's handled explicitly here.  If the ACE_OSCALL
+  // macro ever changes, this function needs to be reviewed.
+  // On Win32, the regular macros can be used, as this is not an issue.
+
 #if defined (ACE_WIN32)
   ACE_SOCKCALL_RETURN (::recv ((ACE_SOCKET) handle, buf, len, flags), int, -1);
 #else
@@ -5112,7 +5102,7 @@ ACE_OS::recvfrom (ACE_HANDLE handle,
                               overlapped,
                               func);
   flags = the_flags;
-  number_of_bytes_recvd = ACE_static_cast (size_t, bytes_recvd);
+  number_of_bytes_recvd = ACE_static_cast(size_t,bytes_recvd);
   return result;
 #else
   ACE_UNUSED_ARG (handle);
@@ -5181,7 +5171,7 @@ ACE_OS::sendto (ACE_HANDLE handle,
                             addrlen,
                             overlapped,
                             func);
-  number_of_bytes_sent = ACE_static_cast (size_t, bytes_sent);
+  number_of_bytes_sent = ACE_static_cast(size_t, bytes_sent);
   return result;
 #else
   ACE_UNUSED_ARG (overlapped);
@@ -5194,8 +5184,8 @@ ACE_OS::sendto (ACE_HANDLE handle,
   for (int i = 0; i < buffer_count; i++)
     {
        result = ACE_OS::sendto (handle,
-                                ACE_reinterpret_cast (char *ACE_CAST_CONST,
-                                                      buffers[i].iov_base),
+                                ACE_reinterpret_cast(char* ACE_CAST_CONST,
+                                                     buffers[i].iov_base),
                                 buffers[i].iov_len,
                                 flags,
                                 addr,
@@ -5215,14 +5205,11 @@ ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr,
 {
   ACE_TRACE ("ACE_OS::getpeername");
 #if defined (ACE_PSOS) && !defined ACE_PSOS_DIAB_PPC
-  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle,
-                                      (struct sockaddr_in *) addr,
+  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #else
-  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle,
-                                      addr,
-                                      (ACE_SOCKET_LEN *) addrlen),
+  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #endif /* defined (ACE_PSOS) */
 }
@@ -6113,7 +6100,7 @@ ACE_OS::last_error (void)
   return lerrno == 0 ? lerror : lerrno;
 #else
   return errno;
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
 }
 
 ACE_INLINE void
@@ -6124,7 +6111,7 @@ ACE_OS::last_error (int error)
   ::SetLastError (error);
 #else
   errno = error;
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
 }
 
 #if !defined (ACE_HAS_WINCE)
@@ -6401,6 +6388,37 @@ ACE_TSS_Emulation::tss_base ()
 #endif /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
 ACE_INLINE
+u_int
+ACE_TSS_Emulation::total_keys ()
+{
+  return total_keys_;
+}
+
+
+ACE_INLINE
+int
+ACE_TSS_Emulation::next_key (ACE_thread_key_t &key)
+{
+  if (total_keys_ < ACE_TSS_THREAD_KEYS_MAX)
+    {
+# if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T)
+      ACE_OS::memset (&key, 0, sizeof (ACE_thread_key_t));
+      ACE_OS::memcpy (&key, &total_keys_, sizeof (u_int));
+# else
+      key = total_keys_;
+# endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */
+
+      ++total_keys_;
+      return 0;
+    }
+  else
+    {
+      key = ACE_OS::NULL_key;
+      return -1;
+    }
+}
+
+ACE_INLINE
 ACE_TSS_Emulation::ACE_TSS_DESTRUCTOR
 ACE_TSS_Emulation::tss_destructor (const ACE_thread_key_t key)
 {
@@ -6722,15 +6740,20 @@ ACE_OS::sigwait (sigset_t *set, int *sig)
     // signal number is returned).
     *sig = ::sigwait (set, 0);
     return *sig;
-#   elif defined (DIGITAL_UNIX)  &&  defined (__DECCXX_VER)
-      // DEC cxx (but not g++) needs this direct call to its internal
-      // sigwait ().  This allows us to #undef sigwait, so that we can
-      // have ACE_OS::sigwait.  cxx gets confused by ACE_OS::sigwait
-      // if sigwait is _not_ #undef'ed.
-      errno = ::_Psigwait (set, sig);
-      return errno == 0  ?  *sig  :  -1;
-#   else /* ! __Lynx __ && ! (DIGITAL_UNIX && __DECCXX_VER) */
-#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || (defined (ACE_HAS_PTHREADS_DRAFT6)) && !defined(ACE_HAS_FSU_PTHREADS)) || (defined (_UNICOS) && _UNICOS == 9)
+#   elif defined (DIGITAL_UNIX)
+#     if defined (__DECCXX_VER)
+        // DEC cxx (but not g++) needs this direct call to its internal
+        // sigwait ().  This allows us to #undef sigwait, so that we can
+        // have ACE_OS::sigwait.  cxx gets confused by ACE_OS::sigwait if
+        // sigwait is _not_ #undef'ed.
+        errno = ::_Psigwait (set, sig);
+        return errno == 0  ?  *sig  :  -1;
+#     else  /* g++, for example, on DIGITAL_UNIX */
+        *sig = ::__sigwaitd10 (set, sig);
+        return errno == 0  ?  *sig  :  -1;
+#     endif /* g++, for example, on DIGITAL_UNIX */
+#   else /* ! __Lynx __ && ! DIGITAL_UNIX */
+#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) && !defined(ACE_HAS_FSU_PTHREADS)
         *sig = ::sigwait (set);
         return *sig;
 #     elif defined(ACE_HAS_FSU_PTHREADS)
@@ -6805,8 +6828,7 @@ ACE_OS::thr_sigsetmask (int how,
   // Draft 4 and 6 implementations will sometimes have a sigprocmask () that
   // modifies the calling thread's mask only.  If this is not so for your
   // platform, define ACE_LACKS_PTHREAD_THR_SIGSETMASK.
-#   elif defined(ACE_HAS_PTHREADS_DRAFT4) || \
-    defined (ACE_HAS_PTHREADS_DRAFT6) || (defined (_UNICOS) && _UNICOS == 9)
+#   elif defined(ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
   ACE_OSCALL_RETURN (::sigprocmask (how, nsm, osm), int, -1);
 #   else
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm),
@@ -7953,32 +7975,28 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
   if (ptr != 0)
     (*((int (*)(void)) ptr)) (); // Call _fini hook explicitly.
 # endif /* ACE_HAS_AUTOMATIC_INIT_FINI */
-#if defined (_M_UNIX)
-  ACE_OSCALL_RETURN (::_dlclose (handle), int, -1);
-#else /* _MUNIX */
-    ACE_OSCALL_RETURN (::dlclose (handle), int, -1);
-#endif /* _M_UNIX */
+  ACE_OSCALL_RETURN (::dlclose (handle), int, -1);
 #elif defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1);
 #elif defined (__hpux)
-  // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count
-  // when unloading a dynamic lib.  So, if the ref count is more than
-  // 1, do not unload the lib.  This will cause a library loaded more
-  // than once to not be unloaded until the process runs down, but
-  // that's life.  It's better than unloading a library that's in use.
-  // So far as I know, there's no way to decrement the refcnt that the
-  // kernel is looking at - the shl_descriptor is a copy of what the
-  // kernel has, not the actual struct.  On 64-bit HP-UX using dlopen,
-  // this problem has been fixed.
+  // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count when
+  // unloading a dynamic lib.  So, if the ref count is more than 1, do not
+  // unload the lib.  This will cause a library loaded more than once to
+  // not be unloaded until the process runs down, but that's life.  It's
+  // better than unloading a library that's in use.
+  // So far as I know, there's no way to decrement the refcnt that the kernel
+  // is looking at - the shl_descriptor is a copy of what the kernel has, not
+  // the actual struct.
+  // On 64-bit HP-UX using dlopen, this problem has been fixed.
   struct shl_descriptor  desc;
-  if (shl_gethandle_r (handle, &desc) == -1)
+  if (shl_gethandle_r(handle, &desc) == -1)
     return -1;
   if (desc.ref_count > 1)
     return 0;
 # if defined(__GNUC__) || __cplusplus >= 199707L
-  ACE_OSCALL_RETURN (::shl_unload (handle), int, -1);
+  ACE_OSCALL_RETURN (::shl_unload(handle), int, -1);
 # else
-  ACE_OSCALL_RETURN (::cxxshl_unload (handle), int, -1);
+  ACE_OSCALL_RETURN (::cxxshl_unload(handle), int, -1);
 # endif  /* aC++ vs. Hp C++ */
 #else
   ACE_UNUSED_ARG (handle);
@@ -7991,11 +8009,7 @@ ACE_OS::dlerror (void)
 {
   ACE_TRACE ("ACE_OS::dlerror");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
-#if defined(_M_UNIX)
-  ACE_OSCALL_RETURN ((char *)::_dlerror (), char *, 0);
-#else /* _M_UNIX */
   ACE_OSCALL_RETURN ((char *)::dlerror (), char *, 0);
-#endif /* _M_UNIX */
 # elif defined (__hpux)
   ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
@@ -8040,8 +8054,6 @@ ACE_OS::dlopen (const ASYS_TCHAR *fname,
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
   ACE_OSCALL (::sgidladd (filename, mode), void *, 0, handle);
-#   elif defined (_M_UNIX)
-  ACE_OSCALL (::_dlopen (filename, mode), void *, 0, handle);
 #   else
   ACE_OSCALL (::dlopen (filename, mode), void *, 0, handle);
 #   endif /* ACE_HAS_SGIDLADD */
@@ -8099,29 +8111,21 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
 #   if defined (ACE_LACKS_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::dlsym (handle, (char*) symbolname), void *, 0);
 #   elif defined (ACE_USES_ASM_SYMBOL_IN_DLSYM)
-  int l = ACE_OS::strlen (symbolname) + 2;
-  char *asm_symbolname = 0;
-  ACE_NEW_RETURN (asm_symbolname,
-                  char[l],
-                  0);
-  ACE_OS::strcpy (asm_symbolname,
-                  "_") ;
-  ACE_OS::strcpy (asm_symbolname + 1,
-                  symbolname) ;
-  void *ace_result;
+  int l = strlen(symbolname) + 2;
+  char* asm_symbolname;
+  ACE_NEW_RETURN(asm_symbolname, char[l], 0);
+  ACE_OS::strcpy (asm_symbolname, "_") ;
+  ACE_OS::strcpy (asm_symbolname + 1, symbolname) ;
+  void* ace_result;
   ACE_OSCALL (::dlsym (handle, asm_symbolname), void *, 0,
               ace_result);
-  delete [] asm_symbolname;
+  delete[] asm_symbolname;
   return ace_result;
-#   elif defined (_M_UNIX)
-  ACE_OSCALL_RETURN (::_dlsym (handle, symbolname), void *, 0);
 #   else
   ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0);
 #   endif /* ACE_LACKS_POSIX_PROTOTYPES */
 # elif defined (ACE_WIN32)
-  ACE_WIN32CALL_RETURN (::GetProcAddress (handle,
-                                          ASYS_ONLY_MULTIBYTE_STRING (symbolname)),
-                        void *, 0);
+  ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0);
 # elif defined (__hpux)
 
   void *value;
@@ -8247,18 +8251,11 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len)
     }
 # endif /* defined (ACE_PSOS_LACKS_PHILE */
 #else
-
-  int result;
-
 # if defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_HAS_CHARPTR_SOCKOPT)
-  ACE_OSCALL (::read (handle, (char *) buf, len), ssize_t, -1, result);
+  ACE_OSCALL_RETURN (::read (handle, (char *) buf, len), ssize_t, -1);
 # else
-  ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result);
+  ACE_OSCALL_RETURN (::read (handle, buf, len), ssize_t, -1);
 # endif /* ACE_LACKS_POSIX_PROTOTYPES */
-  if (result == -1 && errno == EAGAIN)
-    errno = EWOULDBLOCK;
-  return result;
-
 #endif /* ACE_WIN32 */
 }
 
@@ -8850,7 +8847,7 @@ ACE_OS::difftime (time_t t1, time_t t0)
 }
 #endif /* ! ACE_LACKS_DIFFTIME */
 
-#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+#if !defined (ACE_HAS_WINCE)
 ACE_INLINE char *
 ACE_OS::ctime (const time_t *t)
 {
@@ -8863,9 +8860,7 @@ ACE_OS::ctime (const time_t *t)
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
 # endif    /* ACE_HAS_BROKEN_CTIME) */
 }
-#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 
-#if !defined (ACE_HAS_WINCE)
 ACE_INLINE char *
 ACE_OS::ctime_r (const time_t *t, char *buf, int buflen)
 {
@@ -11939,41 +11934,3 @@ ACE_OS_CString::wchar_rep (void)
 {
   return this->rep_;
 }
-
-ACE_INLINE int
-ACE_Countdown_Time::start (void)
-{
-  if (this->max_wait_time_ != 0)
-    {
-      this->start_time_ = ACE_OS::gettimeofday ();
-      this->stopped_ = 0;
-    }
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Countdown_Time::stop (void)
-{
-  if (this->max_wait_time_ != 0 && this->stopped_ == 0)
-    {
-      ACE_Time_Value elapsed_time =
-        ACE_OS::gettimeofday () - this->start_time_;
-
-      if (*this->max_wait_time_ > elapsed_time)
-        *this->max_wait_time_ -= elapsed_time;
-      else
-        {
-          // Used all of timeout.
-          *this->max_wait_time_ = ACE_Time_Value::zero;
-          // errno = ETIME;
-        }
-      this->stopped_ = 1;
-    }
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Countdown_Time::update (void)
-{
-  return (this->stop () == 0) && this->start ();
-}
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 6d0134f0dea..cacc50b5faa 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -173,15 +173,11 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base
   //     doesn't destroy automatic objects, and for developing the
   //     recommendations in this paragraph.
   //
-  //     Instead of creating a static ACE_Object_Manager, or letting
-  //     ACE create it on the stack of main () for you, another
-  //     alternative is to #define
+  //     Instead of creating a static ACE_Object_Manager, or creating
+  //     it on the stack of main (), another alternative is to #define
   //     ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER.  With that
-  //     #define, the application must create the ACE_Object_Manager.
-  //     The recommended way is to call ACE::init () at the start of
-  //     the program, and call ACE::fini () at the end.
-  //     Alternatively, the application could explicity construct an
-  //     ACE_Object_Manager.
+  //     #define, the application _must_ call ACE::init () at the
+  //     start of the program, and call ACE::fini () at the end.
 
 public:
   virtual int init (void);
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index d741da94a98..53f5212e0e6 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -58,9 +58,9 @@ ACE_Pipe::open (void)
   if (result == -1)
     return -1;
 
-#if !defined (ACE_LACKS_TCP_NODELAY)
   int one = 1;
 
+#ifndef ACE_LACKS_TCP_NODELAY
   // Make sure that the TCP stack doesn't try to buffer small writes.
   // Since this communication is purely local to the host it doesn't
   // affect network performance.
@@ -72,7 +72,7 @@ ACE_Pipe::open (void)
   if (writer.set_option (level, TCP_NODELAY,
                          &one, sizeof one) == -1)
     return -1;
-#endif /* ! ACE_LACKS_TCP_NODELAY */
+#endif /* ACE_LACKS_TCP_NODELAY */
 
   this->handles_[0] = reader.get_handle ();
   this->handles_[1] = writer.get_handle ();
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 96a895de393..5abb8601885 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -139,8 +139,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
   if (! x)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in ")
-                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+                ASYS_TEXT ("\nerror: x is a null pointer in "
+                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
   else if (! (x->left()))
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
@@ -178,8 +178,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
   if (! x)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in ")
-                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+                ASYS_TEXT ("\nerror: x is a null pointer in "
+                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
   else if (! (x->right()))
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 61f4be62e7d..ebf860d9786 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -37,7 +37,7 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
   #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
       ACE_NEW (impl,
                ACE_TP_Reactor);
-  #else
+  #else  
       ACE_NEW (impl,
                ACE_Select_Reactor);
   #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */
@@ -68,6 +68,9 @@ ACE_Reactor *ACE_Reactor::reactor_ = 0;
 // only delete it safely if we created it!)
 int ACE_Reactor::delete_reactor_ = 0;
 
+// Terminate the eventloop.
+sig_atomic_t ACE_Reactor::end_event_loop_ = 0;
+
 ACE_Reactor *
 ACE_Reactor::instance (void)
 {
@@ -125,128 +128,134 @@ ACE_Reactor::close_singleton (void)
     }
 }
 
+// Run the event loop until the <ACE_Reactor::handle_events> method
+// returns -1 or the <end_event_loop> method is invoked.
+
 int
-ACE_Reactor::check_reconfiguration (void *)
+ACE_Reactor::run_event_loop (void)
 {
-#if !defined (ACE_HAS_WINCE)
-  if (ACE_Service_Config::reconfig_occurred ())
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
+
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      ACE_Service_Config::reconfigure ();
-      return 1;
+      int result = ACE_Reactor::instance ()->handle_events ();
+
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+        if (result == -1)
+          return -1;
     }
-#endif /* ACE_HAS_WINCE */
+  /* NOTREACHED */
   return 0;
 }
 
+// Run the event loop until the <ACE_Reactor::handle_events>
+// method returns -1, the <end_event_loop> method
+// is invoked, or the <ACE_Time_Value> expires.
+
 int
-ACE_Reactor::run_reactor_event_loop (REACTOR_EVENT_HOOK eh)
+ACE_Reactor::run_event_loop (ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_Reactor::run_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
 
-  while (1)
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      int result = this->implementation_->handle_events ();
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result == -1)
-        return -1;
+      int result = ACE_Reactor::instance ()->handle_events (tv);
+
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+        if (result <= 0)
+          return result;
     }
 
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
 
+// Run the event loop until the <ACE_Reactor::alertable_handle_events> method
+// returns -1 or the <end_event_loop> method is invoked.
+
 int
-ACE_Reactor::run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK eh)
+ACE_Reactor::run_alertable_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
 
-  while (1)
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      int result = this->implementation_->alertable_handle_events ();
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result == -1)
-        return -1;
-    }
+      int result = ACE_Reactor::instance ()->alertable_handle_events ();
 
-  ACE_NOTREACHED (return 0;)
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+
+        if (result == -1)
+          return -1;
+    }
+  /* NOTREACHED */
+  return 0;
 }
 
+// Run the event loop until the <ACE_Reactor::alertable_handle_events>
+// method returns -1, the <end_event_loop> method
+// is invoked, or the <ACE_Time_Value> expires.
+
 int
-ACE_Reactor::run_reactor_event_loop (ACE_Time_Value &tv,
-                                     REACTOR_EVENT_HOOK eh)
+ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_Reactor::run_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
 
-  while (1)
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      int result = this->implementation_->handle_events (tv);
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result <= 0)
-        return result;
+      int result = ACE_Reactor::instance ()->alertable_handle_events (tv);
+
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+        if (result <= 0)
+          return result;
     }
 
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
 
-int
-ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv,
-                                               REACTOR_EVENT_HOOK eh)
+void
+ACE_Reactor::reset_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop");
-
-  while (1)
-    {
-      int result = this->implementation_->alertable_handle_events (tv);
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result <= 0)
-        return result;
-    }
+  ACE_TRACE ("ACE_Reactor::reset_event_loop");
 
-  ACE_NOTREACHED (return 0;)
+  ACE_Reactor::end_event_loop_ = 0;
 }
 
 int
-ACE_Reactor::end_reactor_event_loop (void)
+ACE_Reactor::end_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::end_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::end_event_loop");
+
+  ACE_Reactor::end_event_loop_ = 1;
 
-  this->implementation_->deactivate (1);
+  // Wakeup all threads waiting in the Reactor.
+  ACE_Reactor::instance ()->wakeup_all_threads ();
 
   return 0;
 }
 
 int
-ACE_Reactor::reactor_event_loop_done (void)
+ACE_Reactor::event_loop_done (void)
 {
-  ACE_TRACE ("ACE_Reactor::reactor_event_loop_done");
-  return this->implementation_->deactivated ();
-}
-  // Report if the <ACE_Reactor::instance>'s event loop is finished.
-
-void
-ACE_Reactor::reset_reactor_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::reset_event_loop");
-
-  this->implementation_->deactivate (0);
+  ACE_TRACE ("ACE_Reactor::event_loop_done");
+  return ACE_Reactor::end_event_loop_ != 0;
 }
-  // Resets the <ACE_Reactor::end_event_loop_> static so that the
-  // <run_event_loop> method can be restarted.
 
 void
 ACE_Reactor::dump (void) const
diff --git a/ace/Reactor.h b/ace/Reactor.h
index bbb2fa635f4..e5acd926d5f 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -62,13 +62,6 @@ public:
     // changes enabled bits).
   };
 
-  typedef int (*REACTOR_EVENT_HOOK)(void*);
-  // You can add a hook to various run_event methods and the hook will
-  // be called after handling every reactor event.  If this function
-  // returns 0, run_reactor_event_loop will check for the return value of
-  // handle_event.  If it is -1, the the run_reactor_event_loop will return
-  // (pre-maturely.)
-
   static ACE_Reactor *instance (void);
   // Get pointer to a process-wide <ACE_Reactor>.
 
@@ -81,7 +74,7 @@ public:
   static void close_singleton (void);
   // Delete the dynamically allocated Singleton
 
-  // = Singleton reactor event loop management methods.
+  // = Reactor event loop management methods.
 
   // Note that these method ONLY work on the "Singleton Reactor,"
   // i.e., the one returned from <ACE_Reactor::instance>.
@@ -110,42 +103,6 @@ public:
   // Resets the <ACE_Reactor::end_event_loop_> static so that the
   // <run_event_loop> method can be restarted.
 
-  static int check_reconfiguration (void *);
-  // The singleton reactor is used by the service_configurator.
-  // Therefore, we must check for the reconfiguration request and
-  // handle it after handling an event.
-
-
-  // = Reactor event loop management methods.
-
-  // These methods work with an instance of a reactor.
-  virtual int run_reactor_event_loop (REACTOR_EVENT_HOOK = 0);
-  virtual int run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK = 0);
-  // Run the event loop until the
-  // <ACE_Reactor::handle_events/ACE_Reactor::alertable_handle_events>
-  // method returns -1 or the <end_event_loop> method is invoked.
-
-  virtual int run_reactor_event_loop (ACE_Time_Value &tv,
-                                      REACTOR_EVENT_HOOK = 0);
-  virtual int run_alertable_reactor_event_loop (ACE_Time_Value &tv,
-                                                REACTOR_EVENT_HOOK = 0);
-  // Run the event loop until the <ACE_Reactor::handle_events> or
-  // <ACE_Reactor::alertable_handle_events> methods returns -1, the
-  // <end_event_loop> method is invoked, or the <ACE_Time_Value>
-  // expires.
-
-  virtual int end_reactor_event_loop (void);
-  // Instruct the <ACE_Reactor::instance> to terminate its event loop
-  // and notifies the <ACE_Reactor::instance> so that it can wake up
-  // and close down gracefully.
-
-  virtual int reactor_event_loop_done (void);
-  // Report if the <ACE_Reactor::instance>'s event loop is finished.
-
-  virtual void reset_reactor_event_loop (void);
-  // Resets the <ACE_Reactor::end_event_loop_> static so that the
-  // <run_event_loop> method can be restarted.
-
   ACE_Reactor (ACE_Reactor_Impl *implementation = 0,
                int delete_implementation = 0);
   // Create the Reactor using <implementation>.  The flag
@@ -519,6 +476,9 @@ protected:
   static int delete_reactor_;
   // Must delete the <reactor_> singleton if non-0.
 
+  static sig_atomic_t end_event_loop_;
+  // Terminate the event loop of the singleton Reactor.
+
   ACE_Reactor (const ACE_Reactor &);
   ACE_Reactor &operator = (const ACE_Reactor &);
   // Deny access since member-wise won't work...
diff --git a/ace/Reactor.i b/ace/Reactor.i
index c197c7f325a..ba4c8dd01e9 100644
--- a/ace/Reactor.i
+++ b/ace/Reactor.i
@@ -23,91 +23,11 @@ ACE_Reactor::current_info (ACE_HANDLE handle,
   return this->implementation ()->current_info (handle, size);
 }
 
-// Run the event loop until the <ACE_Reactor::handle_events> method
-// returns -1 or the <end_event_loop> method is invoked.
-
-ACE_INLINE int
-ACE_Reactor::run_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::run_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_reactor_event_loop (ACE_Reactor::check_reconfiguration);
-}
-
-// Run the event loop until the <ACE_Reactor::handle_events>
-// method returns -1, the <end_event_loop> method
-// is invoked, or the <ACE_Time_Value> expires.
-
-ACE_INLINE int
-ACE_Reactor::run_event_loop (ACE_Time_Value &tv)
-{
-  ACE_TRACE ("ACE_Reactor::run_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_reactor_event_loop (tv,
-                                ACE_Reactor::check_reconfiguration);
-}
-
-// Run the event loop until the <ACE_Reactor::alertable_handle_events> method
-// returns -1 or the <end_event_loop> method is invoked.
-
-ACE_INLINE int
-ACE_Reactor::run_alertable_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::run_alertable_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_alertable_reactor_event_loop (ACE_Reactor::check_reconfiguration);
-}
-
-// Run the event loop until the <ACE_Reactor::alertable_handle_events>
-// method returns -1, the <end_event_loop> method
-// is invoked, or the <ACE_Time_Value> expires.
-
-ACE_INLINE int
-ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv)
-{
-  ACE_TRACE ("ACE_Reactor::run_alertable_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_alertable_reactor_event_loop (tv,
-                                          ACE_Reactor::check_reconfiguration);
-}
-
-ACE_INLINE void
-ACE_Reactor::reset_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::reset_event_loop");
-
-  ACE_Reactor::instance ()->reset_reactor_event_loop ();
-}
-
-ACE_INLINE int
-ACE_Reactor::end_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::end_event_loop");
-  ACE_Reactor::instance ()->end_reactor_event_loop ();
-
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Reactor::event_loop_done (void)
-{
-  ACE_TRACE ("ACE_Reactor::event_loop_done");
-  return ACE_Reactor::instance ()->reactor_event_loop_done ();
-}
-
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::open (size_t size,
-                   int restart,
-                   ACE_Sig_Handler *signal_handler,
-                   ACE_Timer_Queue *timer_queue)
+		   int restart,
+		   ACE_Sig_Handler *signal_handler,
+		   ACE_Timer_Queue *timer_queue)
 {
   return this->implementation ()->open (size,
                                         restart,
@@ -126,46 +46,46 @@ ACE_Reactor::set_timer_queue (ACE_Timer_Queue *timer_queue)
   return this->implementation ()->set_timer_queue (timer_queue);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::close (void)
 {
   return this->implementation ()->close ();
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::work_pending (const ACE_Time_Value &max_wait_time)
 {
   return this->implementation ()->work_pending (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->implementation ()->handle_events (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::alertable_handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->implementation ()->alertable_handle_events (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handle_events (ACE_Time_Value &max_wait_time)
 {
   return this->implementation ()->handle_events (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::alertable_handle_events (ACE_Time_Value &max_wait_time)
 {
   return this->implementation ()->alertable_handle_events (max_wait_time);
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (event_handler,
                                                           mask);
@@ -176,10 +96,10 @@ ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
   return result;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_HANDLE io_handle,
-                               ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_Event_Handler *event_handler,
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (io_handle,
                                                           event_handler,
@@ -190,12 +110,12 @@ ACE_Reactor::register_handler (ACE_HANDLE io_handle,
 
   return result;
 }
-
+ 
 #if defined (ACE_WIN32)
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
-                               ACE_HANDLE event_handle)
+			       ACE_HANDLE event_handle)
 {
   int result = this->implementation ()->register_handler (event_handler,
                                                           event_handle);
@@ -205,14 +125,14 @@ ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
 
   return result;
 }
-
+ 
 #endif /* ACE_WIN32 */
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_HANDLE event_handle,
-                               ACE_HANDLE io_handle,
-                               ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_HANDLE io_handle,
+			       ACE_Event_Handler *event_handler,
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (event_handle,
                                                           io_handle,
@@ -224,11 +144,11 @@ ACE_Reactor::register_handler (ACE_HANDLE event_handle,
 
   return result;
 }
-
-ACE_INLINE int
+ 
+ACE_INLINE int 
 ACE_Reactor::register_handler (const ACE_Handle_Set &handles,
-                               ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_Event_Handler *event_handler,
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (handles,
                                                           event_handler,
@@ -236,16 +156,16 @@ ACE_Reactor::register_handler (const ACE_Handle_Set &handles,
   if (result != -1)
     // Assign *this* <Reactor> to the <Event_Handler>.
     event_handler->reactor (this);
-
+  
   return result;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (int signum,
-                               ACE_Event_Handler *new_sh,
-                               ACE_Sig_Action *new_disp,
-                               ACE_Event_Handler **old_sh,
-                               ACE_Sig_Action *old_disp)
+			       ACE_Event_Handler *new_sh,
+			       ACE_Sig_Action *new_disp,
+			       ACE_Event_Handler **old_sh,
+			       ACE_Sig_Action *old_disp)
 {
   return this->implementation ()->register_handler (signum,
                                                     new_sh,
@@ -254,45 +174,45 @@ ACE_Reactor::register_handler (int signum,
                                                     old_disp);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (const ACE_Sig_Set &sigset,
-                               ACE_Event_Handler *new_sh,
-                               ACE_Sig_Action *new_disp)
+			       ACE_Event_Handler *new_sh,
+			       ACE_Sig_Action *new_disp)
 {
   return this->implementation ()->register_handler (sigset,
                                                     new_sh,
                                                     new_disp);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (ACE_Event_Handler *event_handler,
-                             ACE_Reactor_Mask mask)
+			     ACE_Reactor_Mask mask)
 {
   return this->implementation ()->remove_handler (event_handler,
                                                   mask);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (ACE_HANDLE handle,
-                             ACE_Reactor_Mask mask)
+			     ACE_Reactor_Mask mask)
 {
   return this->implementation ()->remove_handler (handle,
                                                   mask);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (const ACE_Handle_Set &handle_set,
-                             ACE_Reactor_Mask mask)
+			     ACE_Reactor_Mask mask)
 {
   return this->implementation ()->remove_handler (handle_set,
                                                   mask);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (int signum,
-                             ACE_Sig_Action *new_disp,
-                             ACE_Sig_Action *old_disp,
-                             int sigkey)
+			     ACE_Sig_Action *new_disp,
+			     ACE_Sig_Action *old_disp,
+			     int sigkey)
 {
   return this->implementation ()->remove_handler (signum,
                                                   new_disp,
@@ -300,67 +220,67 @@ ACE_Reactor::remove_handler (int signum,
                                                   sigkey);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (const ACE_Sig_Set &sigset)
 {
   return this->implementation ()->remove_handler (sigset);
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handler (ACE_Event_Handler *event_handler)
 {
   return this->implementation ()->suspend_handler (event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handler (ACE_HANDLE handle)
 {
   return this->implementation ()->suspend_handler (handle);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handler (const ACE_Handle_Set &handles)
 {
   return this->implementation ()->suspend_handler (handles);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handlers (void)
 {
   return this->implementation ()->suspend_handlers ();
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handler (ACE_Event_Handler *event_handler)
 {
   return this->implementation ()->resume_handler (event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handler (ACE_HANDLE handle)
 {
   return this->implementation ()->resume_handler (handle);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handler (const ACE_Handle_Set &handles)
 {
   return this->implementation ()->resume_handler (handles);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handlers (void)
 {
   return this->implementation ()->resume_handlers ();
 }
 
 
-ACE_INLINE long
+ACE_INLINE long 
 ACE_Reactor::schedule_timer (ACE_Event_Handler *event_handler,
-                             const void *arg,
-                             const ACE_Time_Value &delta,
-                             const ACE_Time_Value &interval)
+			     const void *arg,
+			     const ACE_Time_Value &delta,
+			     const ACE_Time_Value &interval)
 {
   int result = this->implementation ()->schedule_timer (event_handler,
                                                         arg,
@@ -373,28 +293,28 @@ ACE_Reactor::schedule_timer (ACE_Event_Handler *event_handler,
   return result;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_timer (ACE_Event_Handler *event_handler,
-                           int dont_call_handle_close)
+			   int dont_call_handle_close)
 {
   return this->implementation ()->cancel_timer (event_handler,
                                                 dont_call_handle_close);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_timer (long timer_id,
-                           const void **arg,
-                           int dont_call_handle_close)
+			   const void **arg,
+			   int dont_call_handle_close)
 {
   return this->implementation ()->cancel_timer (timer_id,
                                                 arg,
                                                 dont_call_handle_close);
 }
 
-
-ACE_INLINE int
+  
+ACE_INLINE int 
 ACE_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler,
-                              ACE_Reactor_Mask masks_to_be_added)
+			      ACE_Reactor_Mask masks_to_be_added)
 {
   int result = this->implementation ()->schedule_wakeup (event_handler,
                                                          masks_to_be_added);
@@ -404,73 +324,73 @@ ACE_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler,
 
   return result;
 }
-
-ACE_INLINE int
+  
+ACE_INLINE int 
 ACE_Reactor::schedule_wakeup (ACE_HANDLE handle,
-                              ACE_Reactor_Mask masks_to_be_added)
+			      ACE_Reactor_Mask masks_to_be_added)
 {
   return implementation ()->schedule_wakeup (handle,
                                              masks_to_be_added);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_wakeup (ACE_Event_Handler *event_handler,
-                            ACE_Reactor_Mask masks_to_be_cleared)
+			    ACE_Reactor_Mask masks_to_be_cleared)
 {
   return this->implementation ()->cancel_wakeup (event_handler,
                                                  masks_to_be_cleared);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_wakeup (ACE_HANDLE handle,
-                            ACE_Reactor_Mask masks_to_be_cleared)
+			    ACE_Reactor_Mask masks_to_be_cleared)
 {
   return this->implementation ()->cancel_wakeup (handle,
                                                  masks_to_be_cleared);
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::notify (ACE_Event_Handler *event_handler,
-                     ACE_Reactor_Mask mask,
-                     ACE_Time_Value *tv)
+		     ACE_Reactor_Mask mask,
+		     ACE_Time_Value *tv)
 {
   return this->implementation ()->notify (event_handler,
                                           mask,
                                           tv);
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Reactor::max_notify_iterations (int iterations)
 {
   this->implementation ()->max_notify_iterations (iterations);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::max_notify_iterations (void)
 {
   return this->implementation ()->max_notify_iterations ();
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handler (ACE_HANDLE handle,
-                      ACE_Reactor_Mask mask,
-                      ACE_Event_Handler **event_handler)
+		      ACE_Reactor_Mask mask,
+		      ACE_Event_Handler **event_handler)
 {
   return this->implementation ()->handler (handle,
                                            mask,
                                            event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handler (int signum,
-                      ACE_Event_Handler **event_handler)
+		      ACE_Event_Handler **event_handler)
 {
   return this->implementation ()->handler (signum,
                                            event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::initialized (void)
 {
   return this->implementation ()->initialized ();
@@ -482,73 +402,73 @@ ACE_Reactor::lock (void)
   return this->implementation ()->lock ();
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Reactor::wakeup_all_threads (void)
 {
   this->implementation ()->wakeup_all_threads ();
 }
 
-ACE_INLINE int
-ACE_Reactor::owner (ACE_thread_t new_owner,
-                    ACE_thread_t *old_owner)
+ACE_INLINE int 
+ACE_Reactor::owner (ACE_thread_t new_owner, 
+		    ACE_thread_t *old_owner)
 {
-  return this->implementation ()->owner (new_owner,
+  return this->implementation ()->owner (new_owner, 
                                          old_owner);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::owner (ACE_thread_t *owner)
 {
   return this->implementation ()->owner (owner);
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Reactor::requeue_position (int position)
 {
   this->implementation ()->requeue_position (position);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::requeue_position (void)
 {
   return this->implementation ()->requeue_position ();
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::mask_ops (ACE_Event_Handler *event_handler,
-                       ACE_Reactor_Mask mask,
-                       int ops)
+		       ACE_Reactor_Mask mask,
+		       int ops)
 {
   return this->implementation ()->mask_ops (event_handler,
                                             mask,
                                             ops);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::mask_ops (ACE_HANDLE handle,
-                       ACE_Reactor_Mask mask,
-                       int ops)
+		       ACE_Reactor_Mask mask,
+		       int ops)
 {
   return this->implementation ()->mask_ops (handle,
                                             mask,
                                             ops);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::ready_ops (ACE_Event_Handler *event_handler,
-                        ACE_Reactor_Mask mask,
-                        int ops)
+			ACE_Reactor_Mask mask,
+			int ops)
 {
   return this->implementation ()->ready_ops (event_handler,
                                              mask,
                                              ops);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::ready_ops (ACE_HANDLE handle,
-                        ACE_Reactor_Mask mask,
-                        int ops)
+			ACE_Reactor_Mask mask,
+			int ops)
 {
   return this->implementation ()->ready_ops (handle,
                                              mask,
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 7eb92659812..85c3033534c 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -155,18 +155,6 @@ public:
   // return when the system queues an I/O completion routine or an
   // Asynchronous Procedure Call.
 
-  // = Event handling control.
-
-  virtual int deactivated (void) = 0;
-  // Return the status of Reactor.  If this function returns 0, the reactor is
-  // actively handling events.  If it returns non-zero, <handling_events> and
-  // <handle_alertable_events> return -1 immediately.
-
-  virtual void deactivate (int do_stop) = 0;
-  // Control whether the Reactor will handle any more incoming events or not.
-  // If <do_stop> == 1, the Reactor will be disabled.  By default, a reactor
-  // is in active state and can be deactivated/reactived as wish.
-
   // = Register and remove Handlers.
 
   virtual int register_handler (ACE_Event_Handler *event_handler,
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 10e4bde796b..67a10d44d64 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -30,14 +30,10 @@ int
 ACE_SOCK::get_remote_addr (ACE_Addr &sa) const
 {
   ACE_TRACE ("ACE_SOCK::get_remote_addr");
-
   int len = sa.get_size ();
-  sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                         sa.get_addr ());
+  sockaddr *addr = (sockaddr *) sa.get_addr ();
 
-  if (ACE_OS::getpeername (this->get_handle (),
-                           addr,
-                           &len) == -1)
+  if (ACE_OS::getpeername (this->get_handle (), addr, &len) == -1)
     return -1;
   
   sa.set_size (len);
@@ -48,14 +44,10 @@ int
 ACE_SOCK::get_local_addr (ACE_Addr &sa) const
 {
   ACE_TRACE ("ACE_SOCK::get_local_addr");
-
   int len = sa.get_size ();
-  sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                         sa.get_addr ());
+  sockaddr *addr = (sockaddr *) sa.get_addr ();
 
-  if (ACE_OS::getsockname (this->get_handle (),
-                           addr,
-                           &len) == -1)
+  if (ACE_OS::getsockname (this->get_handle (), addr, &len) == -1)
     return -1;
 
   sa.set_size (len);
@@ -141,6 +133,7 @@ ACE_SOCK::open (int type,
                                     protocolinfo,
                                     g,
                                     flags));
+
   int one = 1;
 
   if (this->get_handle () == ACE_INVALID_HANDLE)
@@ -154,8 +147,7 @@ ACE_SOCK::open (int type,
       this->close ();
       return -1;
     }
-  else
-    return 0;
+  return 0;
 }
 
 ACE_SOCK::ACE_SOCK (int type, 
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 576806bc256..6918bf12ff3 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -29,15 +29,15 @@
 class ACE_Export ACE_SOCK : public ACE_IPC_SAP
 {
   // = TITLE
-  //     An abstract class that forms the basis for more specific
-  //     classes, such as <ACE_SOCK_Acceptor> and <ACE_SOCK_Stream>.
+  //     An abstract class which forms the basis for more specific
+  //     classes (such as ACE_SOCK_Acceptor and ACE_SOCK_Stream).
   //     Do not instantiate this class.
   //
   // = DESCRIPTION
   //    This class provides functions that are common to all of the
-  //    <ACE_SOCK_*> classes. <ACE_SOCK> provides the ability to get
-  //    and set socket options, get the local and remote addresses,
-  //    and close the socket.
+  //    SOCK-type classes. ACE_SOCK provides the ability to get and
+  //    set socket options, get the local and remote addresses, and
+  //    close the socket.
 public:
   ~ACE_SOCK (void);
   // Default ctor/dtor.
@@ -46,25 +46,24 @@ public:
                   int option,
                   void *optval,
                   int optlen) const;
-  // Wrapper around the <setsockopt> system call.
+  // Wrapper around the setsockopt() system call.
 
   int get_option (int level,
                   int option,
                   void *optval,
                   int *optlen) const;
-  // Wrapper around the <getsockopt> system call.
+  // Wrapper around the getsockopt() system call.
 
   int close (void);
   // Close down the socket.
 
   int get_local_addr (ACE_Addr &) const;
-  // Return the local endpoint address in the referenced <ACE_Addr>.
+  // Return the local endpoint address in the referenced ACE_Addr.
   // Returns 0 if successful, else -1.
 
   int get_remote_addr (ACE_Addr &) const;
   // Return the address of the remotely connected peer (if there is
-  // one), in the referenced <ACE_Addr>. Returns 0 if successful, else
-  // -1.
+  // one), in the referenced ACE_Addr. Returns 0 if successful, else -1.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -112,6 +111,6 @@ protected:
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+#endif
 
 #endif /* ACE_SOCK_H */
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 612dd023028..96726920173 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -71,9 +71,8 @@ ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream,
     {
       // Save/restore errno.
       ACE_Errno_Guard error (errno);
-
-      // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
-      // originally.
+      // Only disable ACE_NONBLOCK if we weren't in
+      // non-blocking mode originally.
       ACE::clr_flags (this->get_handle (),
 		      ACE_NONBLOCK);
       ACE::clr_flags (new_handle,
@@ -195,62 +194,29 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 				     reset_new_handle);
 }
 
-void
-ACE_SOCK_Acceptor::dump (void) const
+// General purpose routine for performing server ACE_SOCK creation.
+
+ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
+				      int reuse_addr,
+				      int protocol_family,
+				      int backlog,
+				      int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Acceptor::dump");
+  ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
+  if (this->open (local_sap,
+		  reuse_addr,
+		  protocol_family,
+		  backlog,
+		  protocol) == -1)
+    ACE_ERROR ((LM_ERROR,
+		ASYS_TEXT ("%p\n"),
+		ASYS_TEXT ("ACE_SOCK_Acceptor")));
 }
 
-int
-ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
-                                int protocol_family,
-                                int backlog)
+void
+ACE_SOCK_Acceptor::dump (void) const
 {
-  ACE_TRACE ("ACE_SOCK_Acceptor::shared_open");
-  int error = 0;
-
-  if (protocol_family == PF_INET)
-    {
-      sockaddr_in local_inet_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet_addr),
-                      0,
-                      sizeof local_inet_addr);
-
-      if (local_sap == ACE_Addr::sap_any)
-        {
-          local_inet_addr.sin_port = 0;
-          local_inet_addr.sin_addr.s_addr = htonl (INADDR_ANY);
-        }
-      else
-        local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *,
-                                                 local_sap.get_addr ());
-      if (local_inet_addr.sin_port == 0)
-        {
-          if (ACE::bind_port (this->get_handle (),
-                              local_inet_addr.sin_addr.s_addr) == -1)
-            error = 1;
-        }
-      else if (ACE_OS::bind (this->get_handle (),
-                             ACE_reinterpret_cast (sockaddr *,
-                                                   &local_inet_addr),
-                             sizeof local_inet_addr) == -1)
-        error = 1;
-    }
-  else if (ACE_OS::bind (this->get_handle (),
-			 (sockaddr *) local_sap.get_addr (),
-                         local_sap.get_size ()) == -1)
-    error = 1;
-
-  if (error != 0
-      || ACE_OS::listen (this->get_handle (),
-                         backlog) == -1)
-    {
-      error = 1;
-      this->close ();
-    }
-
-  return error ? -1 : 0;
+  ACE_TRACE ("ACE_SOCK_Acceptor::dump");
 }
 
 int
@@ -264,19 +230,15 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
                          int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::open");
-
-  if (ACE_SOCK::open (SOCK_STREAM,
-		      protocol_family,
-		      protocol,
-                      protocolinfo,
-                      g,
-                      flags,
-		      reuse_addr) == -1)
-    return -1;
-  else
-    return this->shared_open (local_sap,
-                              protocol_family,
-                              backlog);
+  ACE_UNUSED_ARG (local_sap);
+  ACE_UNUSED_ARG (protocolinfo);
+  ACE_UNUSED_ARG (g);
+  ACE_UNUSED_ARG (flags);
+  ACE_UNUSED_ARG (reuse_addr);
+  ACE_UNUSED_ARG (protocol_family);
+  ACE_UNUSED_ARG (backlog);
+  ACE_UNUSED_ARG (protocol);
+  ACE_NOTSUP_RETURN (-1);
 }
 
 ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
@@ -312,33 +274,55 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
 			 int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::open");
+  int error = 0;
 
   if (ACE_SOCK::open (SOCK_STREAM,
 		      protocol_family,
 		      protocol,
 		      reuse_addr) == -1)
-    return -1;
-  else
-    return this->shared_open (local_sap,
-                              protocol_family,
-                              backlog);
-}
+    error = 1;
 
-// General purpose routine for performing server ACE_SOCK creation.
+  else if (protocol_family == PF_INET)
+    {
+      sockaddr_in local_inet_addr;
+      ACE_OS::memset ((void *) &local_inet_addr,
+                      0,
+                      sizeof local_inet_addr);
 
-ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
-				      int reuse_addr,
-				      int protocol_family,
-				      int backlog,
-				      int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
-  if (this->open (local_sap,
-		  reuse_addr,
-		  protocol_family,
-		  backlog,
-		  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SOCK_Acceptor")));
+      if (local_sap == ACE_Addr::sap_any)
+        {
+          local_inet_addr.sin_port = 0;
+          local_inet_addr.sin_addr.s_addr = htonl (INADDR_ANY);
+        }
+      else
+        local_inet_addr = *(sockaddr_in *) local_sap.get_addr ();
+
+      if (local_inet_addr.sin_port == 0)
+        {
+          if (ACE::bind_port (this->get_handle (),
+                              local_inet_addr.sin_addr.s_addr) == -1)
+            error = 1;
+        }
+      else
+        {
+          if (ACE_OS::bind (this->get_handle (),
+                            ACE_reinterpret_cast (sockaddr *,
+						  &local_inet_addr),
+                            sizeof local_inet_addr) == -1)
+            error = 1;
+        }
+    }
+  else if (ACE_OS::bind (this->get_handle (),
+			 (sockaddr *) local_sap.get_addr (),
+                         local_sap.get_size ()) == -1)
+    error = 1;
+
+  if (error || ACE_OS::listen (this->get_handle (),
+			       backlog) == -1)
+    {
+      error = 1;
+      this->close ();
+    }
+
+  return error ? -1 : 0;
 }
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index 3d2c236c540..e86ba1e8522 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -47,9 +47,6 @@ public:
                      int backlog = ACE_DEFAULT_BACKLOG,
                      int protocol = 0);
   // Initialize a passive-mode BSD-style acceptor socket (no QoS).
-  // <local_sap> is the address that we're going to listen for
-  // connections on.  If <reuse_addr> is 1 then we'll use the
-  // <SO_REUSEADDR> to reuse this address.
 
   ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                      ACE_Protocol_Info *protocolinfo,
@@ -68,10 +65,7 @@ public:
             int backlog = ACE_DEFAULT_BACKLOG,
             int protocol = 0);
   // Initialize a passive-mode BSD-style acceptor socket (no QoS).
-  // <local_sap> is the address that we're going to listen for
-  // connections on.  If <reuse_addr> is 1 then we'll use the
-  // <SO_REUSEADDR> to reuse this address.  Returns 0 on success and
-  // -1 on failure.
+  // Returns 0 on success and -1 on failure.
 
   int open (const ACE_Addr &local_sap,
             ACE_Protocol_Info *protocolinfo,
@@ -131,13 +125,6 @@ protected:
   // Perform operations that must occur after <ACE_OS::accept> is
   // called.
 
-  int shared_open (const ACE_Addr &local_sap,
-                   int protocol_family,
-                   int backlog);
-  // This method factors out the common <open> code and is called by
-  // both the QoS-enabled <open> method and the BSD-style <open>
-  // method.
-
 private:
   int get_remote_addr (ACE_Addr &) const;
   // Do not allow this function to percolate up to this interface...
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 49ecdb8a8f7..f5f1ab00077 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -21,62 +21,25 @@ ACE_SOCK_Connector::dump (void) const
 }
 
 int
-ACE_SOCK_Connector::shared_open (ACE_SOCK_Stream &new_stream,
-                                 int protocol_family,
-                                 int protocol,
-                                 int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::shared_open");
-
-  // Only open a new socket if we don't already have a valid handle.
-  if (new_stream.get_handle () == ACE_INVALID_HANDLE
-      && new_stream.open (SOCK_STREAM,
-			  protocol_family,
-			  protocol,
-			  reuse_addr) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Connector::shared_open (ACE_SOCK_Stream &new_stream,
-                                 int protocol_family,
-                                 int protocol,
-                                 ACE_Protocol_Info *protocolinfo,
-                                 ACE_SOCK_GROUP g,
-                                 u_long flags,
-                                 int reuse_addr)
+ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
+					  ACE_Time_Value *timeout,
+					  const ACE_Addr &local_sap,
+					  int reuse_addr,
+					  int protocol_family,
+					  int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Connector::shared_open");
-
+  ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start");
   // Only open a new socket if we don't already have a valid handle.
   if (new_stream.get_handle () == ACE_INVALID_HANDLE
       && new_stream.open (SOCK_STREAM,
 			  protocol_family,
 			  protocol,
-                          protocolinfo,
-                          g,
-                          flags,
 			  reuse_addr) == -1)
     return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
-					  ACE_Time_Value *timeout,
-					  const ACE_Addr &local_sap)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start");
-
-  if (local_sap != ACE_Addr::sap_any)
+  else if (local_sap != ACE_Addr::sap_any)
     {
-      sockaddr *laddr = ACE_reinterpret_cast (sockaddr *,
-                                              local_sap.get_addr ());
+      sockaddr *laddr = (sockaddr *) local_sap.get_addr ();
       size_t size = local_sap.get_size ();
-
       if (ACE_OS::bind (new_stream.get_handle (),
 			laddr,
 			size) == -1)
@@ -89,8 +52,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
     }
 
   // Enable non-blocking, if required.
-  if (timeout != 0 
-      && new_stream.enable (ACE_NONBLOCK) == -1)
+  if (timeout != 0 && new_stream.enable (ACE_NONBLOCK) == -1)
     return -1;
   else
     return 0;
@@ -111,8 +73,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
       if (error == EINPROGRESS || error == EWOULDBLOCK)
 	{
 	  // This expression checks if we were polling.
-	  if (timeout->sec () == 0 
-              && timeout->usec () == 0)
+	  if (timeout->sec () == 0 && timeout->usec () == 0)
 	    error = EWOULDBLOCK;
 	  // Wait synchronously using timeout.
 	  else if (this->complete (new_stream,
@@ -134,7 +95,6 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
 
   return result;
 }
-
 // Actively connect and produce a new ACE_SOCK_Stream if things go well...
 
 int
@@ -149,19 +109,16 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
 			     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::connect");
-  if (this->shared_open (new_stream,
-                         protocol_family,
-                         protocol,
-                         reuse_addr) == -1)
-    return -1;
-  else if (this->shared_connect_start (new_stream,
-                                       timeout,
-                                       local_sap) == -1)
+  if (this->shared_connect_start (new_stream,
+				  timeout,
+				  local_sap,
+				  reuse_addr,
+				  protocol_family,
+				  protocol) == -1)
     return -1;
 
   int result = ACE_OS::connect (new_stream.get_handle (),
-				ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+				(sockaddr *) remote_sap.get_addr (),
 				remote_sap.get_size ());
 
   return this->shared_connect_finish (new_stream,
@@ -175,31 +132,25 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
 			     ACE_QoS_Params qos_params,
 			     ACE_Time_Value *timeout,
 			     const ACE_Addr &local_sap,
-                             ACE_Protocol_Info * protocolinfo,
-                             ACE_SOCK_GROUP g,
-			     u_long flags,
+                             ACE_Protocol_Info * /* protocolinfo */,
+                             ACE_SOCK_GROUP /* g */,
+			     u_long /* flags */,
 			     int reuse_addr,
 			     int /* perms */,
 			     int protocol_family,
 			     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::connect");
-  if (this->shared_open (new_stream,
-                         protocol_family,
-                         protocol,
-                         protocolinfo,
-                         g,
-                         flags,
-                         reuse_addr) == -1)
-    return -1;
-  else if (this->shared_connect_start (new_stream,
-                                       timeout,
-                                       local_sap) == -1)
+  if (this->shared_connect_start (new_stream,
+				  timeout,
+				  local_sap,
+				  reuse_addr,
+				  protocol_family,
+				  protocol) == -1)
     return -1;
 
   int result = ACE_OS::connect (new_stream.get_handle (),
-				ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+				(sockaddr *) remote_sap.get_addr (),
 				remote_sap.get_size (),
 				qos_params);
 
@@ -218,8 +169,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   ACE_TRACE ("ACE_SOCK_Connector::complete");
 #if defined (ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS)
   // Win32 has a timing problem - if you check to see if the
-  // connection has completed too fast, it will fail - so wait
-  // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up.
+  // connection has completed too fast, it will fail - so wait 1
+  // millisecond to let it catch up.
   ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY);
   ACE_OS::sleep (time);
 #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
@@ -236,8 +187,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   else if (remote_sap != 0)
     {
       int len = remote_sap->get_size ();
-      sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                             remote_sap->get_addr ());
+      sockaddr *addr = (sockaddr *) remote_sap->get_addr ();
+
       if (ACE_OS::getpeername (h,
 			       addr,
 			       &len) == -1)
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index b2d3957f377..6d4387239b6 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -172,26 +172,12 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  int shared_open (ACE_SOCK_Stream &new_stream,
-                   int protocol_family, 
-                   int protocol,
-                   int reuse_addr);
-  // Perform operations that ensure the socket is opened using
-  // BSD-style semantics (no QoS).
-
-  int shared_open (ACE_SOCK_Stream &new_stream,
-                   int protocol_family,
-                   int protocol,
-                   ACE_Protocol_Info *protocolinfo,
-                   ACE_SOCK_GROUP g,
-                   u_long flags,
-                   int reuse_addr);
-  // Perform operations that ensure the socket is opened using
-  // QoS-enabled semantics.
-
   int shared_connect_start (ACE_SOCK_Stream &new_stream,
 			    ACE_Time_Value *timeout,
-			    const ACE_Addr &local_sap);
+			    const ACE_Addr &local_sap,
+			    int reuse_addr,
+			    int protocol_family, 
+			    int protocol);
   // Perform operations that must be called before <ACE_OS::connect>.
 
   int shared_connect_finish (ACE_SOCK_Stream &new_stream,
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 497392a3cd2..2c12b6eadd9 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -100,24 +100,58 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local,
   ACE_TRACE ("ACE_SOCK_Dgram::shared_open");
   int error = 0;
 
-  if (local == ACE_Addr::sap_any 
-      && protocol_family == PF_INET)
+  if (local == ACE_Addr::sap_any && protocol_family == PF_INET)
     {
       if (ACE::bind_port (this->get_handle ()) == -1)
         error = 1;
     }
-  else if (ACE_OS::bind (this->get_handle (),
-                         ACE_reinterpret_cast (sockaddr *,
-                                               local.get_addr ()),
+  else if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (), 
                          local.get_size ()) == -1)
     error = 1;
 
-  if (error != 0)
+  if (error)
     this->close ();
 
   return error ? -1 : 0;
 }
 
+// Here's the general-purpose constructor used by a connectionless
+// datagram ``server''...
+
+ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
+                                int protocol_family, 
+                                int protocol,
+                                int reuse_addr)
+  : ACE_SOCK (SOCK_DGRAM, protocol_family, protocol, reuse_addr)
+{
+  ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
+
+  if (this->shared_open (local, protocol_family) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_SOCK_Dgram")));
+}
+
+ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
+                                const ACE_QoS_Params &qos_params,
+                                int protocol_family, 
+                                int protocol,
+                                ACE_Protocol_Info *protocolinfo,
+                                ACE_SOCK_GROUP g,
+                                u_long flags,
+                                int reuse_addr)
+  : ACE_SOCK (SOCK_DGRAM,
+              protocol_family,
+              protocol,
+              protocolinfo,
+              g,
+              flags,
+              reuse_addr)
+{
+  ACE_UNUSED_ARG (qos_params);
+  ACE_UNUSED_ARG (local);
+}
+
 int
 ACE_SOCK_Dgram::open (const ACE_Addr &local, 
                       const ACE_QoS_Params &qos_params,
@@ -128,26 +162,17 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local,
                       u_long flags,
                       int reuse_addr)
 {
-  if (ACE_SOCK::open (SOCK_DGRAM,
-                      protocol_family, 
-                      protocol,
-                      protocolinfo,
-                      g,
-                      flags,
-                      reuse_addr) == -1)
-    return -1;
-  else if (this->shared_open (local,
-                              protocol_family) == -1)
-    return -1;
-  else
-    // Pass the QoS parameters.
-    return ACE_OS::join_leaf (this->get_handle (),
-                              ACE_reinterpret_cast (const sockaddr *,
-                                                    local.get_addr ()),
-                              local.get_size (),
-                              qos_params) == ACE_INVALID_HANDLE
-      ? -1 
-      : 0;
+  ACE_UNUSED_ARG (local);
+  ACE_UNUSED_ARG (qos_params);
+  ACE_UNUSED_ARG (protocol_family);
+  ACE_UNUSED_ARG (protocol);
+  ACE_UNUSED_ARG (protocolinfo);
+  ACE_UNUSED_ARG (g);
+  ACE_UNUSED_ARG (flags);
+  ACE_UNUSED_ARG (reuse_addr);
+
+  // Under construction...
+  ACE_NOTSUP_RETURN (-1);
 }
 
 // Here's the general-purpose open routine.
@@ -169,48 +194,6 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local,
                               protocol_family);
 }
 
-// Here's the general-purpose constructor used by a connectionless
-// datagram ``server''...
-
-ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
-                                int protocol_family, 
-                                int protocol,
-                                int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
-
-  if (this->open (local,
-                  protocol_family,
-                  protocol,
-                  reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SOCK_Dgram")));
-}
-
-ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
-                                const ACE_QoS_Params &qos_params,
-                                int protocol_family, 
-                                int protocol,
-                                ACE_Protocol_Info *protocolinfo,
-                                ACE_SOCK_GROUP g,
-                                u_long flags,
-                                int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
-  if (this->open (local,
-                  qos_params,
-                  protocol_family,
-                  protocol,
-                  protocolinfo,
-                  g,
-                  flags,
-                  reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SOCK_Dgram")));
-}
-
 #if defined (ACE_HAS_MSG)
 // Send an iovec of size N to ADDR as a datagram (connectionless
 // version).
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index 833e89ff404..061ab9f669d 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -1,5 +1,7 @@
+// SOCK_Dgram_Bcast.cpp
 // $Id$
 
+
 #define ACE_BUILD_DLL
 #include "ace/SOCK_Dgram_Bcast.h"
 
@@ -12,8 +14,8 @@ ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$")
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast)
 
 ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
-                                ACE_Bcast_Node *next)
-  : bcast_addr_ (addr),
+				ACE_Bcast_Node *next)
+  : bcast_addr_ (addr), 
     next_ (next)
 {
   ACE_TRACE ("ACE_Bcast_Node::ACE_Bcast_Node");
@@ -58,12 +60,12 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (void)
 // Here's the general-purpose constructor used by a connectionless
 // datagram ``server''...
 
-ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
-                                            int protocol_family,
-                                            int protocol,
-                                            int reuse_addr,
+ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, 
+					    int protocol_family, 
+					    int protocol,
+					    int reuse_addr,
                                             const ASYS_TCHAR *host_name)
-  : ACE_SOCK_Dgram (local, protocol_family, protocol, reuse_addr),
+  : ACE_SOCK_Dgram (local, protocol_family, protocol, reuse_addr), 
     if_list_ (0)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast");
@@ -77,16 +79,16 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
 // Here's the general-purpose open routine.
 
 int
-ACE_SOCK_Dgram_Bcast::open (const ACE_Addr &local,
-                            int protocol_family,
-                            int protocol,
-                            int reuse_addr,
+ACE_SOCK_Dgram_Bcast::open (const ACE_Addr &local, 
+			    int protocol_family, 
+			    int protocol,
+			    int reuse_addr,
                             const ASYS_TCHAR *host_name)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::open");
 
-  if (this->ACE_SOCK_Dgram::open (local, protocol_family,
-                                  protocol, reuse_addr) == -1)
+  if (this->ACE_SOCK_Dgram::open (local, protocol_family, 
+				  protocol, reuse_addr) == -1)
     return -1;
 
   return this->mk_broadcast (host_name);
@@ -103,8 +105,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
 
   if (ACE_OS::setsockopt (this->get_handle (),
                           SOL_SOCKET,
-                          SO_BROADCAST,
-                          (char *) &one,
+                          SO_BROADCAST, 
+			  (char *) &one,
                           sizeof one) == -1)
     return -1;
 
@@ -122,9 +124,9 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
   if (ACE_OS::ioctl (s,
                      SIOCGIFCONF,
                      (char *) &ifc) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                      "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"),
-                      ACE_INVALID_HANDLE);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", 
+		      "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"),
+		      ACE_INVALID_HANDLE);
 
   struct ifreq *ifr = ifc.ifc_req;
 
@@ -136,43 +138,44 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
       hostent *hp = ACE_OS::gethostbyname (ASYS_MULTIBYTE_STRING (host_name));
 
       if (hp == 0)
-        return -1;
+	return -1;
       else
-#if defined(_UNICOS)
+#if !defined(_UNICOS)
+	ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr, 
+			(char *) hp->h_addr, 
+			hp->h_length);
+#else /* _UNICOS */
         {
           ACE_UINT64 haddr;  // a place to put the address
           char * haddrp = (char *) &haddr;  // convert to char pointer
+          haddr += 4;   // adjust within the word
           ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length);
           host_addr.sin_addr.s_addr = haddr;
         }
-#else /* ! _UNICOS */
-        ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr,
-                        (char *) hp->h_addr,
-                        hp->h_length);
 #endif /* ! _UNICOS */
     }
 
-  for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++)
+  for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) 
     {
       // Compare host ip address with interface ip address.
       if (host_name)
         {
-          struct sockaddr_in if_addr;
+	  struct sockaddr_in if_addr;
 
           ACE_OS::memcpy (&if_addr,
                           &ifr->ifr_addr,
                           sizeof if_addr);
 
           if (host_addr.sin_addr.s_addr != if_addr.sin_addr.s_addr)
-            continue;
+	    continue;
         }
 
-      if (ifr->ifr_addr.sa_family != AF_INET)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n",
-                      "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"));
-          continue;
-        }
+      if (ifr->ifr_addr.sa_family != AF_INET) 
+	{
+	  ACE_ERROR ((LM_ERROR, "%p\n", 
+		      "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"));
+	  continue;
+	}
 
       struct ifreq flags = *ifr;
       struct ifreq if_req = *ifr;
@@ -180,46 +183,46 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
       if (ACE_OS::ioctl (s,
                          SIOCGIFFLAGS,
                          (char *) &flags) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n",
-                     "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"));
-          continue;
-        }
+	{
+	  ACE_ERROR ((LM_ERROR, "%p\n", 
+		     "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"));
+	  continue;
+	}   
 
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_UP) == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n",
-                     "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"));
-          continue;
-        }
+	{
+	  ACE_ERROR ((LM_ERROR, "%p\n", 
+		     "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"));
+	  continue;
+	}
 
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_LOOPBACK))
-        continue;
+	continue;
 
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_BROADCAST))
-        {
-          if (ACE_OS::ioctl (s,
+	{
+	  if (ACE_OS::ioctl (s,
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
-            ACE_ERROR ((LM_ERROR, "%p\n",
-                       "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"));
-          else
-            {
-              ACE_INET_Addr addr (ACE_reinterpret_cast (sockaddr_in *,
+	    ACE_ERROR ((LM_ERROR, "%p\n", 
+		       "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"));
+	  else 
+	    {
+	      ACE_INET_Addr addr (ACE_reinterpret_cast (sockaddr_in *,
                                                         &if_req.ifr_broadaddr),
                                   sizeof if_req.ifr_broadaddr);
-              ACE_NEW_RETURN (this->if_list_,
+	      ACE_NEW_RETURN (this->if_list_,
                               ACE_Bcast_Node (addr,
                                               this->if_list_),
                               -1);
-            }
-        }
-      else
-        ACE_ERROR ((LM_ERROR, "%p\n",
-                   "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."));
+	    }
+	}
+      else 
+	ACE_ERROR ((LM_ERROR, "%p\n", 
+		   "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."));
     }
 #else
   ACE_UNUSED_ARG (host_name);
@@ -238,16 +241,16 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
 // number of bytes sent.
 
 ssize_t
-ACE_SOCK_Dgram_Bcast::send (const void *buf,
-                            size_t n,
-                            u_short port_number,
-                            int flags) const
+ACE_SOCK_Dgram_Bcast::send (const void *buf, 
+			    size_t n,
+			    u_short port_number, 
+			    int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
   size_t iterations = 0;
   ssize_t total_bytes = 0;
 
-  if (this->if_list_ == 0)
+  if (this->if_list_ == 0) 
     return -1;
 
   for (ACE_Bcast_Node *temp = this->if_list_;
@@ -256,16 +259,16 @@ ACE_SOCK_Dgram_Bcast::send (const void *buf,
     {
       temp->bcast_addr_.set_port_number (port_number);
 
-      ssize_t bytes_sent = ACE_SOCK_Dgram::send (buf,
-                                                 n,
-                                                 temp->bcast_addr_,
-                                                 flags);
+      ssize_t bytes_sent = ACE_SOCK_Dgram::send (buf, 
+                                                 n, 
+						 temp->bcast_addr_, 
+						 flags);
 
       if (bytes_sent == -1)
-        return -1;
-      else
-        total_bytes += bytes_sent;
-
+	return -1;
+      else 
+	total_bytes += bytes_sent;
+	
       iterations++;
     }
 
@@ -276,21 +279,21 @@ ACE_SOCK_Dgram_Bcast::send (const void *buf,
 // Broadcast datagram to every interfaces.
 
 ssize_t
-ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
-                            size_t n,
-                            u_short /* port_number */,
-                            int flags) const
+ACE_SOCK_Dgram_Bcast::send (const iovec iov[], 
+			    size_t n, 
+			    u_short /* port_number */,
+			    int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
 
   if (this->if_list_ == 0)
     return -1;
-
+  
   // Send the message to every interface.
 
   for (ACE_Bcast_Node *temp = this->if_list_;
        temp != 0;
-       temp++)
+       temp++) 
     if (ACE_SOCK_Dgram::send (iov,
                               n,
                               temp->bcast_addr_,
@@ -304,10 +307,10 @@ ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
 // must be preassigned to the broadcast address of the subnet...).
 
 ssize_t
-ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
-                            size_t n,
-                            const ACE_Addr &addr,
-                            int flags) const
+ACE_SOCK_Dgram_Bcast::send (const iovec iov[], 
+			    size_t n, 
+			    const ACE_Addr &addr, 
+			    int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
 
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index d9bbaca1524..0a184226281 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -6,7 +6,7 @@
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram_Mcast.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+#endif
 
 ACE_RCSID(ace, SOCK_Dgram_Mcast, "$Id$")
 
@@ -26,76 +26,16 @@ ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast (void)
 }
 
 int
-ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
-                            int protocol_family,
-                            int protocol,
-                            int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open");
-
-  // Make a copy of address to use in the <send> methods.
-  // Note: Sun C++ 4.2 needs the useless const_cast.
-  this->mcast_addr_.set (ACE_reinterpret_cast (const ACE_INET_Addr &,
-                                               ACE_const_cast (ACE_Addr &,
-                                                               mcast_addr)));
-
-  // Only perform the <open> initialization if we haven't been opened
-  // earlier.
-  if (this->get_handle () == ACE_INVALID_HANDLE)
-    {
-      if (ACE_SOCK::open (SOCK_DGRAM,
-                          protocol_family,
-                          protocol,
-                          reuse_addr) == -1)
-        return -1;
-
-      int one = 1;
-      if (reuse_addr
-          && this->ACE_SOCK::set_option (SOL_SOCKET,
-                                         SO_REUSEADDR,
-                                         &one,
-                                         sizeof one) == -1)
-        return -1;
-#if defined (SO_REUSEPORT)
-      else if (this->ACE_SOCK::set_option (SOL_SOCKET,
-                                           SO_REUSEPORT,
-                                           &one,
-                                           sizeof one) == -1)
-        return -1;
-#endif /* SO_REUSEPORT */
-
-      // Create an address to bind the socket to.
-      ACE_INET_Addr local;
-
-      if (local.set (this->mcast_addr_.get_port_number ()) == -1)
-        return -1;
-      else if (ACE_SOCK_Dgram::shared_open (local,
-                                            protocol_family) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
-                            const ACE_QoS_Params &qos_params,
-                            int protocol_family,
-                            int protocol,
-                            ACE_Protocol_Info *protocolinfo,
-                            ACE_SOCK_GROUP g,
-                            u_long flags,
-                            int reuse_addr)
+ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
+                                   int reuse_addr,
+                                   const ASYS_TCHAR *net_if,
+                                   int protocol_family,
+                                   int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open");
-
-  ACE_UNUSED_ARG (qos_params);
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_i");
 
   // Make a copy of address to use in the <send> methods.
-  // Note: Sun C++ 4.2 needs the useless const_cast.
-  this->mcast_addr_.set (ACE_reinterpret_cast (const ACE_INET_Addr &,
-                                               ACE_const_cast (ACE_Addr &,
-                                                               mcast_addr)));
+  this->mcast_addr_.set (mcast_addr);
 
   // Only perform the <open> initialization if we haven't been opened
   // earlier.
@@ -104,9 +44,6 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
       if (ACE_SOCK::open (SOCK_DGRAM,
                           protocol_family,
                           protocol,
-                          protocolinfo,
-                          g,
-                          flags,
                           reuse_addr) == -1)
         return -1;
 
@@ -118,10 +55,10 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
                                          sizeof one) == -1)
         return -1;
 #if defined (SO_REUSEPORT)
-      else if (this->ACE_SOCK::set_option (SOL_SOCKET,
-                                           SO_REUSEPORT,
-                                           &one,
-                                           sizeof one) == -1)
+      if (this->ACE_SOCK::set_option (SOL_SOCKET,
+                                      SO_REUSEPORT,
+                                      &one,
+                                      sizeof one) == -1)
         return -1;
 #endif /* SO_REUSEPORT */
 
@@ -134,18 +71,6 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
                                             protocol_family) == -1)
         return -1;
     }
-
-  return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                     const ASYS_TCHAR *net_if,
-                                     int protocol_family,
-                                     int protocol,
-                                     int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
 #if defined (ACE_WIN32)
   // Windows NT's winsock has trouble with multicast subscribes in the
   // presence of multiple network interfaces when the IP address is
@@ -214,109 +139,8 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
       else
         return 1;
     }
-#else
-  ACE_UNUSED_ARG (mcast_addr);
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-  ACE_UNUSED_ARG (reuse_addr);
+  // else do it like everyone else...
 #endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else...
-
-  // Create multicast request.
-  if (this->make_multicast_address (this->mcast_addr_,
-                                    net_if) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                     const ACE_QoS_Params &qos_params,
-                                     const ASYS_TCHAR *net_if,
-                                     int protocol_family,
-                                     int protocol,
-                                     int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
-#if defined (ACE_WIN32)
-  // Windows NT's winsock has trouble with multicast subscribes in the
-  // presence of multiple network interfaces when the IP address is
-  // given as INADDR_ANY.  It will pick the first interface and only
-  // accept mcast there.  So, to work around this, cycle through all
-  // of the interfaces known and subscribe to all the non-loopback
-  // ones.
-  //
-  // Note that this only needs to be done on NT, but there's no way to
-  // tell at this point if the code will be running on NT - only if it
-  // is compiled for NT-only or for NT/95, and that doesn't really
-  // help us.  It doesn't hurt to do this on Win95, it's just a little
-  // slower than it normally would be.
-  //
-  // NOTE - <ACE::get_ip_interfaces> doesn't always get all of the
-  // interfaces.  In particular, it may not get a PPP interface.  This
-  // is a limitation of the way <ACE::get_ip_interfaces> works with
-  // MSVC.  The reliable way of getting the interface list is
-  // available only with MSVC 5.
-
-  if (net_if == 0)
-    {
-      ACE_INET_Addr *if_addrs = 0;
-      size_t if_cnt;
-
-      if (ACE::get_ip_interfaces (if_cnt,
-                                  if_addrs) != 0)
-        return -1;
-
-      size_t nr_subscribed = 0;
-
-      if (if_cnt < 2)
-        {
-          if (this->subscribe (mcast_addr,
-                               qos_params,
-                               reuse_addr,
-                               ASYS_TEXT ("0.0.0.0"),
-                               protocol_family,
-                               protocol) == 0)
-            ++nr_subscribed;
-        }
-      else
-        // Iterate through all the interfaces, figure out which ones
-        // offer multicast service, and subscribe to them.
-        while (if_cnt > 0)
-          {
-            --if_cnt;
-
-            // Convert to 0-based for indexing, next loop check.
-            if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK)
-              continue;
-            if (this->subscribe (mcast_addr,
-                                 qos_params,
-                                 reuse_addr,
-                                 ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
-                                 protocol_family,
-                                 protocol) == 0)
-              ++nr_subscribed;
-          }
-
-      delete [] if_addrs;
-
-      if (nr_subscribed == 0)
-        {
-          errno = ENODEV;
-          return -1;
-        }
-      else
-        return 1;
-    }
-#else
-  ACE_UNUSED_ARG (mcast_addr);
-  ACE_UNUSED_ARG (qos_params);
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-  ACE_UNUSED_ARG (reuse_addr);
-#endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else...
 
   // Create multicast request.
   if (this->make_multicast_address (this->mcast_addr_,
@@ -333,28 +157,19 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
                                  int protocol_family,
                                  int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
-
-  if (this->open (mcast_addr,
-                  protocol_family,
-                  protocol,
-                  reuse_addr) == -1)
-    return -1;
-
-  int result = this->subscribe_ifs (mcast_addr,
-                                    net_if,
-                                    protocol_family,
-                                    protocol,
-                                    reuse_addr);
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
-
-  // Create multicast request.
-  else if (this->make_multicast_address (this->mcast_addr_,
-                                         net_if) == -1)
+  int result = this->subscribe_i (mcast_addr,
+                                  reuse_addr,
+                                  net_if,
+                                  protocol_family,
+                                  protocol);
+  // Check for the error case.
+  if (result == -1)
     return -1;
-
+#if defined (ACE_WIN32)
+  // Check for the "short-circuit" return value (for NT).
+  else if (result == 1)
+    return 0;
+#endif /* ACE_WIN32 */
   // Tell network device driver to read datagrams with a
   // multicast_address IP interface.
   else if (this->ACE_SOCK::set_option (IPPROTO_IP,
@@ -374,25 +189,22 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
                                  int protocol_family,
                                  int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
-
-  if (this->open (mcast_addr,
-                  protocol_family,
-                  protocol,
-                  reuse_addr) == -1)
+  int result = this->subscribe_i (mcast_addr,
+                                  reuse_addr,
+                                  net_if,
+                                  protocol_family,
+                                  protocol);
+  // Check for the error case.
+  if (result == -1)
     return -1;
+#if defined (ACE_WIN32)
+  // @@ Note that this code is currently broken since <subscribe_i>
+  // calls the wrong version of subscribe recursively!
 
-  // The following method call only applies to Win32 currently.
-  int result = this->subscribe_ifs (mcast_addr,
-                                    qos_params,
-                                    net_if,
-                                    protocol_family,
-                                    protocol,
-                                    reuse_addr);
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
-
+  // Check for the "short-circuit" return value (for NT).
+  else if (result == 1)
+    return 0;
+#endif /* ACE_WIN32 */
   // Tell network device driver to read datagrams with a
   // <mcast_request_if_> IP interface.
   else if (ACE_OS::join_leaf (this->get_handle (),
@@ -412,12 +224,12 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
 }
 
 int
-ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                       const ASYS_TCHAR *net_if,
-                                       int protocol_family,
-                                       int protocol)
+ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
+                                     const ASYS_TCHAR *net_if,
+                                     int protocol_family,
+                                     int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_ifs");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_i");
 #if defined (ACE_WIN32)
   // Windows NT's winsock has trouble with multicast subscribes in the
   // presence of multiple network interfaces when the IP address is
@@ -481,14 +293,13 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
 
       return 1;
     }
-#else
+  // else do it like everyone else...
+#endif /* ACE_WIN32 */
+
   ACE_UNUSED_ARG (protocol_family);
   ACE_UNUSED_ARG (protocol);
-#endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else.
 
   ip_mreq multicast_address;
-
   // Create multicast request.
   if (this->make_multicast_address_i (mcast_addr,
                                       multicast_address,
@@ -505,24 +316,27 @@ ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr,
                                    int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
-  int result = this->unsubscribe_ifs (mcast_addr,
-                                      net_if,
-                                      protocol_family,
-                                      protocol);
-
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
+  int result = this->unsubscribe_i (mcast_addr,
+                                    net_if,
+                                    protocol_family,
+                                    protocol);
 
-  // Tell network device driver to stop reading datagrams with the
-  // <mcast_addr>.
+  // Check for error return and bail out.
+  if (result == -1)
+    return -1;
+#if defined (ACE_WIN32)
+  // Check for the "short-circuit" return value (for NT).
+  else if (result == 1)
+    return 0;
+#endif /* ACE_WIN32 */
+  // Tell network device driver to read datagrams with a
+  // multicast_address address.
   else if (ACE_SOCK::set_option (IPPROTO_IP,
                                  IP_DROP_MEMBERSHIP,
                                  &this->mcast_request_if_,
                                  sizeof this->mcast_request_if_) == -1)
     return -1;
-  else
-    return 0;
+  return 0;
 }
 
 int
@@ -551,7 +365,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
       multicast_address.imr_interface.s_addr =
         htonl (interface_addr.get_ip_address ());
 #else
-      ifreq if_address;
+      struct ifreq if_address;
 
 #if defined (ACE_PSOS)
       // Look up the interface by number, not name.
@@ -565,7 +379,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
                          &if_address) == -1)
         return -1;
 
-      sockaddr_in *socket_address;
+      struct sockaddr_in *socket_address;
       socket_address = ACE_reinterpret_cast(sockaddr_in *,
                                             &if_address.ifr_addr);
       multicast_address.imr_interface.s_addr = socket_address->sin_addr.s_addr;
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index e09199b0f81..b74db60e6da 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -134,50 +134,27 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  // = Disable public <open> methods to ensure class used properly.
-
-  int open (const ACE_Addr &mcast_addr,
-            int protocol_family = PF_INET,
-            int protocol = 0,
-            int reuse_addr = 0);
-  // Not publically visible.
-
-  int open (const ACE_Addr &mcast_addr,
-            const ACE_QoS_Params &qos_params,
-            int protocol_family = PF_INET,
-            int protocol = 0,
-            ACE_Protocol_Info *protocolinfo = 0,
-            ACE_SOCK_GROUP g = 0,
-            u_long flags = 0,
-            int reuse_addr = 0);
-  // Not publically visible.
-
-  int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                     const ASYS_TCHAR *net_if,
-                     int protocol_family,
-                     int protocol,
-                     int reuse_addr);
-  // Subscribe to the multicast interface using BSD-style semantics
-  // (no QoS).
-
-  int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                     const ACE_QoS_Params &qos_params,
-                     const ASYS_TCHAR *net_if,
-                     int protocol_family,
-                     int protocol,
-                     int reuse_addr);
-  // Subscribe to the multicast interface using QoS-enabled semantics.
-
-  int unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                       const ASYS_TCHAR *net_if = 0,
-                       int protocol_family = PF_INET,
-                       int protocol = 0);
-  // Unsubscribe to multicast interfaces subscribed to previously by
-  // <subscribe_ifs>.
-
-  // = Disable public use of <ACE_SOCK_Dgram::send>s 
-
-  // This forces <ACE_SOCK_Dgram_Mcast::send>s inline.
+  ACE_HANDLE open (const ACE_Addr &local,
+                   int protocol_family = PF_INET,
+                   int protocol = 0);
+  // Disable public use of <ACE_SOCK_Dgram::open> to ensure the class
+  // is used properly.
+
+  int subscribe_i (const ACE_INET_Addr &mcast_addr,
+		   int reuse_addr = 1,
+		   const ASYS_TCHAR *net_if = 0,
+		   int protocol_family = PF_INET,
+		   int protocol = 0);
+  // Implementation method of <subscribe>.
+
+  int unsubscribe_i (const ACE_INET_Addr &mcast_addr,
+		     const ASYS_TCHAR *net_if = 0,
+		     int protocol_family = PF_INET,
+		     int protocol = 0);
+  // Implementation method of <unsubscribe>.
+
+  // = Disable public use of <ACE_SOCK_Dgram::send>s and force
+  // <ACE_SOCK_Dgram_Mcast::send>s inline.
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Addr &addr,
diff --git a/ace/SOCK_Dgram_Mcast.i b/ace/SOCK_Dgram_Mcast.i
index ddbbe3cfc4f..1d0e6e8004e 100644
--- a/ace/SOCK_Dgram_Mcast.i
+++ b/ace/SOCK_Dgram_Mcast.i
@@ -1,6 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
+// SOCK_Dgram_Mcast.i
+
 ASYS_INLINE
 ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast (void)
 {
@@ -11,17 +13,13 @@ ACE_SOCK_Dgram_Mcast::set_option (int option,
 				  char optval) 
 { 
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::set_option");
-#if defined (ACE_WIN32)
-  int sock_opt = optval;
-  return this->ACE_SOCK::set_option (IPPROTO_IP,
-                                     option, 
-				     &sock_opt,
-                                     sizeof (sock_opt));
+#if !defined (ACE_WIN32)
+  return this->ACE_SOCK::set_option (IPPROTO_IP, option, 
+				     &optval, sizeof (char));
 #else
-  return this->ACE_SOCK::set_option (IPPROTO_IP,
-                                     option, 
-				     &optval,
-                                     sizeof (optval));
+  int sock_opt = optval;
+  return this->ACE_SOCK::set_option (IPPROTO_IP, option, 
+				     &sock_opt, sizeof (sock_opt));
 #endif /* !ACE_WIN32 */  
 }
 
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 36024b8d57d..84d12bedf9a 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -3,14 +3,12 @@
 #define ACE_BUILD_DLL
 #include "ace/Malloc.h"
 #if !defined (ACE_HAS_WINCE)
-# include "ace/Service_Config.h"
+#  include "ace/Service_Config.h"
 #endif /* !ACE_HAS_WINCE */
 #include "ace/SString.h"
 #include "ace/Auto_Ptr.h"
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-# include "ace/streams.h"
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#include "ace/streams.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SString.i"
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index 66a9d70627c..fda7b6b1cb0 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -1,3 +1,4 @@
+// SV_Semaphore_Simple.cpp
 // $Id$
 
 /* -*- C++ -*- */
@@ -21,8 +22,8 @@ ACE_SV_Semaphore_Simple::dump (void) const
 
 int
 ACE_SV_Semaphore_Simple::control (int cmd,
-                                  int value,
-                                  u_short semnum) const
+				  int value,
+				  u_short semnum) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::control");
   if (this->internal_id_ == -1)
@@ -34,7 +35,7 @@ ACE_SV_Semaphore_Simple::control (int cmd,
       semctl_arg.val = value;
       return ACE_OS::semctl (this->internal_id_,
                              semnum,
-                             cmd,
+			     cmd,
                              semctl_arg);
     }
 }
@@ -73,15 +74,15 @@ ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const
 
 int
 ACE_SV_Semaphore_Simple::open (key_t k,
-                               int flags,
-                               int initial_value,
-                               u_short n,
-                               int perms)
+			       int flags,
+			       int initial_value,
+			       u_short n,
+			       int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
   union semun ivalue;
 
-  if (k == IPC_PRIVATE || k == ACE_static_cast (key_t, ACE_INVALID_SEM_KEY))
+  if (k == IPC_PRIVATE || k == ACE_INVALID_SEM_KEY)
     return -1;
 
   ivalue.val = initial_value;
@@ -96,16 +97,16 @@ ACE_SV_Semaphore_Simple::open (key_t k,
   if (ACE_BIT_ENABLED (flags, IPC_CREAT))
     for (int i = 0; i < n; i++)
       if (ACE_OS::semctl (this->internal_id_, i, SETVAL, ivalue) == -1)
-        return -1;
+	return -1;
 
   return 0;
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k,
-                                                  int flags,
-                                                  int initial_value,
-                                                  u_short n,
-                                                  int perms)
+						  int flags,
+						  int initial_value,
+						  u_short n,
+						  int perms)
   : key_ (k)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
@@ -128,7 +129,7 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
   if (name == 0)
     {
       errno = EINVAL;
-      return ACE_static_cast (key_t, ACE_INVALID_SEM_KEY);
+      return ACE_INVALID_SEM_KEY;
     }
 
   // Basically "hash" the values in the <name>.  This won't
@@ -142,10 +143,10 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
 
 int
 ACE_SV_Semaphore_Simple::open (const char *name,
-                               int flags,
-                               int initial_value,
-                               u_short n,
-                               int perms)
+			       int flags,
+			       int initial_value,
+			       u_short n,
+			       int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
 
@@ -160,15 +161,15 @@ ACE_SV_Semaphore_Simple::open (const char *name,
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
-                                                  int flags,
-                                                  int initial_value,
-                                                  u_short n,
-                                                  int perms)
+						  int flags,
+						  int initial_value,
+						  u_short n,
+						  int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
   if (this->open (name, flags, initial_value, n, perms) == -1)
     ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
+		ASYS_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
 
 ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 41ee8fe7e1f..c904b07820e 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -132,8 +132,7 @@ protected:
   int sem_number_;
   // Number of semaphores we're creating.
 
-  int init (key_t k = ACE_static_cast (key_t, ACE_INVALID_SEM_KEY),
-            int i = -1);
+  int init (key_t k = ACE_INVALID_SEM_KEY, int i = -1);
   key_t name_2_key (const char *name);
   // Convert name to key This function is used internally to create
   // keys for the semaphores. A valid name contains letters and
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index ab1b8f654ac..83f9d3d29eb 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -476,9 +476,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
    int disable_notify_pipe,
    ACE_Reactor_Notify *notify)
     : token_ (*this),
-      lock_adapter_ (token_),
-      deactivated_ (0)
-
+      lock_adapter_ (token_)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T");
 
@@ -1168,7 +1166,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events
   ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1);
 
   if (ACE_OS::thr_equal (ACE_Thread::self (),
-                         this->owner_) == 0 || this->deactivated_)
+                         this->owner_) == 0)
     return -1;
 
   // Update the countdown to reflect time waiting for the mutex.
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index e4ee05b97ea..6c6a41e71e5 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -193,18 +193,6 @@ public:
   // Current <alertable_handle_events> is identical to
   // <handle_events>.
 
-  // = Event handling control.
-
-  virtual int deactivated (void);
-  // Return the status of Reactor.  If this function returns 0, the reactor is
-  // actively handling events.  If it returns non-zero, <handling_events> and
-  // <handle_alertable_events> return -1 immediately.
-
-  virtual void deactivate (int do_stop);
-  // Control whether the Reactor will handle any more incoming events or not.
-  // If <do_stop> == 1, the Reactor will be disabled.  By default, a reactor
-  // is in active state and can be deactivated/reactived as wish.
-
   // = Register and remove <ACE_Event_Handler>s.
   virtual int register_handler (ACE_Event_Handler *eh,
                                 ACE_Reactor_Mask mask);
@@ -612,9 +600,6 @@ protected:
   int handle_events_i (ACE_Time_Value *max_wait_time = 0);
   // Stops the VC++ compiler from bitching about exceptions and destructors
 
-  sig_atomic_t deactivated_;
-  // This flag is used to keep track of whether we are actively handling
-  // events or not.
 
 private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor_T (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &))
diff --git a/ace/Select_Reactor_T.i b/ace/Select_Reactor_T.i
index 9c447a5d50b..f394c01053b 100644
--- a/ace/Select_Reactor_T.i
+++ b/ace/Select_Reactor_T.i
@@ -219,19 +219,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::alertable_handle_events (ACE_Tim
   return this->handle_events (max_wait_time);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivated (void)
-{
-  return this->deactivated_;
-}
-
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ void
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivate (int do_stop)
-{
-  this->deactivated_ = do_stop;
-  this->wakeup_all_threads ();
-}
-
 template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ size_t
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::size (void)
 {
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 50cd504b45b..52a2ec4b190 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -536,11 +536,6 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 {
   int result = 0;
   ACE_TRACE ("ACE_Service_Config::open");
-  ACE_Log_Msg *log_msg = ACE_LOG_MSG;
-
-  // Record the current log setting upon entering this thread.
-  int debugging_enabled =
-    log_msg->log_priority_enabled (LM_DEBUG);
 
   if (ACE_Service_Config::is_initialized_ != 0)
     // Guard against reentrant processing!
@@ -550,7 +545,8 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 
   if (ACE_Service_Config::init_svc_conf_file_queue () == -1)
     return -1;
-  else if (!ignore_default_svc_conf_file
+
+  if (!ignore_default_svc_conf_file
       && ACE_Service_Config::svc_conf_file_queue_->is_empty ()
       // Load the default "svc.conf" entry here if there weren't
       // overriding -f arguments in <parse_args>.
@@ -561,19 +557,15 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
                        "enqueue_tail"),
                       -1);
 
-  // If -d was included as a startup parameter, the user wants debug
-  // information printed during service initialization.
+  // Clear the LM_DEBUG bit from log messages if appropriate.  This
+  // will be reset at the bottom of this function.
   if (ACE::debug ())
-    ACE_Log_Msg::enable_debug_messages ();
-  else 
-    // The user has requested no debugging info.
     ACE_Log_Msg::disable_debug_messages ();
-
   // Become a daemon before doing anything else.
   if (ACE_Service_Config::be_a_daemon_)
     ACE_Service_Config::start_daemon ();
 
-  u_long flags = log_msg->flags ();
+  u_long flags = ACE_LOG_MSG->flags ();
 
   if (flags == 0)
     // Only use STDERR if the caller hasn't already set the flags.
@@ -587,9 +579,9 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
     // equal to the default static logger key.
     key = ACE_Service_Config::logger_key_;
 
-  if (log_msg->open (program_name,
-                     flags,
-                     key) == -1)
+  if (ACE_LOG_MSG->open (program_name,
+                         flags,
+                         key) == -1)
     result = -1;
   else
     {
@@ -611,16 +603,15 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
         result = -1;
       else
         {
-          int result =
-            ACE_Service_Config::process_commandline_directives ();
-          result =
-            ACE_Service_Config::process_directives () + result;
+          int result = ACE_Service_Config::process_commandline_directives ();
+          result = ACE_Service_Config::process_directives () + result;
         }
 
-      // There's no point in dealing with this on NT since it doesn't
-      // really support signals very well...
+      // There's no point in dealing with this on NT since it doesn't really
+      // support signals very well...
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
-      // @@ This really ought to be a Singleton.
+      // This really ought to be a Singleton I suspect...
+
       if (ACE_Reactor::instance ()->register_handler
           (ACE_Service_Config::signum_,
            ACE_Service_Config::signal_handler_) == -1)
@@ -631,13 +622,8 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 
   ace_yy_delete_parse_buffer ();
 
-  // Reset debugging back to the way it was when we came into into
-  // <open_i>.
-  if (debugging_enabled)
+  if (ACE::debug ())
     ACE_Log_Msg::enable_debug_messages ();
-   else 
-     // Debugging was off when we entered <open_i>.
-    ACE_Log_Msg::disable_debug_messages ();
 
   return result;
 }
@@ -647,8 +633,7 @@ ACE_Service_Config::ACE_Service_Config (const ASYS_TCHAR program_name[],
 {
   ACE_TRACE ("ACE_Service_Config::ACE_Service_Config");
 
-  if (this->open (program_name, 
-                  logger_key) == -1
+  if (this->open (program_name, logger_key) == -1
       && errno != ENOENT)
     // Only print out an error if it wasn't the svc.conf file that was
     // missing.
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index de6e960da81..2c991865674 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -91,16 +91,12 @@ class ACE_Export ACE_Service_Config
   //     configuration of services.
   //
   // = DESCRIPTION
-  //     The <ACE_Service_Config> uses the Monostate pattern.  Therefore,
-  //     you can only have one of these instantiated per-process.
-  // 
   //     NOTE: the signal_handler_ static member is allocated by the
-  //     <ACE_Object_Manager>.  The <ACE_Service_Config> constructor
-  //     uses signal_handler_.  Therefore, if the program has any
-  //     static <ACE_Service_Config> objects, there might be
-  //     initialization order problems.  They can be minimized, but
-  //     not eliminated, by _not_ #defining
-  //     ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+  //     ACE_Object_Manager.  The ACE_Service_Config constructor uses
+  //     signal_handler_.  Therefore, if the program has any static
+  //     ACE_Service_Config objects, there might be initialization
+  //     order problems.  They can be minimized, but not eliminated,
+  //     by _not_ #defining ACE_HAS_NONSTATIC_OBJECT_MANAGER.
 public:
   enum {MAX_SERVICES = ACE_DEFAULT_SELECT_REACTOR_SIZE};
 
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 3e49485f5f7..d22733c872d 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -103,8 +103,7 @@ ACE_Service_Manager::init (int argc, ASYS_TCHAR *argv[])
          break;
        }
 
-  if (this->get_handle () == ACE_INVALID_HANDLE &&
-      this->open (local_addr) == -1)
+  if (this->open (local_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
                        ASYS_TEXT ("open")), -1);
@@ -129,17 +128,11 @@ ACE_Service_Manager::fini (void)
 {
   ACE_TRACE ("ACE_Service_Manager::fini");
 
-  int retv = 0;
   if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      retv = ACE_Reactor::instance ()->remove_handler
-        (this,
-         ACE_Event_Handler::ACCEPT_MASK |
-         ACE_Event_Handler::DONT_CALL);
-      this->handle_close (ACE_INVALID_HANDLE,
-                          ACE_Event_Handler::NULL_MASK);
-    }
-  return retv;
+    return ACE_Reactor::instance ()->remove_handler
+      (this,
+       ACE_Event_Handler::ACCEPT_MASK);
+  return 0;
 }
 
 ACE_HANDLE
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 4aaf6be5e14..6dc4def40c4 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -68,7 +68,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
           // ACE_Object_Manager:  we'll have to leak this instance.
 #endif /* ACE_MT_SAFE */
 
-          ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
+          ACE_NEW_RETURN (singleton,
+                          (ACE_Singleton<TYPE,
+                           ACE_LOCK>), 0);
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -85,8 +87,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
-
+              ACE_NEW_RETURN (singleton,
+                              (ACE_Singleton<TYPE, ACE_LOCK>),
+                              0);
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
             }
@@ -108,99 +111,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
 // Pointer to the Singleton instance.
 template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *
 ACE_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
-
-template <class TYPE, class ACE_LOCK> ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump");
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("instance_ = %x"),
-              ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK>
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (void)
-{
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++ and it's (mis-)handling of templates and statics...
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *singleton_ = 0;
-
-  return singleton_;
-#else
-  return ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance");
-
-  ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      if (ACE_Object_Manager::starting_up () ||
-          ACE_Object_Manager::shutting_down ())
-        {
-          // The program is still starting up, and therefore assumed
-          // to be single threaded.  There's no need to double-check.
-          // Or, the ACE_Object_Manager instance has been destroyed,
-          // so the preallocated lock is not available.  Either way,
-          // don't register for destruction with the
-          // ACE_Object_Manager:  we'll have to leak this instance.
-#endif /* ACE_MT_SAFE */
-
-          ACE_NEW_RETURN (singleton, (ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>),
-                          0);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-        }
-      else
-        {
-          // Obtain a lock from the ACE_Object_Manager.  The pointer
-          // is static, so we only obtain one per
-          // ACE_Unmanaged_Singleton instantiation.
-          static ACE_LOCK *lock = 0;
-          if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
-            return 0;
-
-          ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
-
-          if (singleton == 0)
-            ACE_NEW_RETURN (singleton,
-                            (ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>),
-                            0);
-        }
-#endif /* ACE_MT_SAFE */
-    }
-
-  return &singleton->instance_;
-}
-
-template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void)
-{
-  ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  if (singleton)
-    singleton->cleanup ();
-}
-
-template <class TYPE, class ACE_LOCK> void
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
   ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump");
@@ -248,8 +161,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
           // don't register for destruction with the
           // ACE_Object_Manager:  we'll have to leak this instance.
 #endif /* ACE_MT_SAFE */
-
-          ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0);
+          ACE_NEW_RETURN (singleton,
+                          (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
+                          0);
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -265,9 +179,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
+              ACE_NEW_RETURN (singleton,
+                              (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
                               0);
-
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
             }
@@ -281,105 +195,16 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 template <class TYPE, class ACE_LOCK> void
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
 {
+  ACE_TRACE ("ACE_TSS_Singleton::cleanup");
+
   delete this;
   ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
 }
 
-template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump");
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("instance_ = %x"),
-              ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK>
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
-{
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++ and it's (mis-)handling of templates and statics...
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *singleton_ = 0;
-
-  return singleton_;
-#else
-  return ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance");
-
-  ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      if (ACE_Object_Manager::starting_up () ||
-          ACE_Object_Manager::shutting_down ())
-        {
-          // The program is still starting up, and therefore assumed
-          // to be single threaded.  There's no need to double-check.
-          // Or, the ACE_Object_Manager instance has been destroyed,
-          // so the preallocated lock is not available.  Either way,
-          // don't register for destruction with the
-          // ACE_Object_Manager:  we'll have to leak this instance.
-#endif /* ACE_MT_SAFE */
-          ACE_NEW_RETURN (singleton,
-                          (ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>),
-                          0);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-        }
-      else
-        {
-          // Obtain a lock from the ACE_Object_Manager.  The pointer
-          // is static, so we only obtain one per
-          // ACE_Unmanaged_Singleton instantiation.
-          static ACE_LOCK *lock = 0;
-          if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
-            return 0;
-
-          ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
-
-          if (singleton == 0)
-            ACE_NEW_RETURN (singleton,
-                            (ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>),
-                            0);
-        }
-#endif /* ACE_MT_SAFE */
-    }
-
-  return ACE_TSS_GET (&singleton->instance_, TYPE);
-}
-
-template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::close (void)
-{
-  ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  if (singleton)
-    singleton->cleanup ();
-}
-
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
 // Pointer to the Singleton instance.
 template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton <TYPE, ACE_LOCK> *
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
-
-template <class TYPE, class ACE_LOCK>
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 #endif /* ACE_SINGLETON_C */
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 9bef9acf126..14bb6461ccb 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -104,45 +104,6 @@ protected:
 };
 
 template <class TYPE, class ACE_LOCK>
-class ACE_Unmanaged_Singleton : public ACE_Singleton <TYPE, ACE_LOCK>
-{
-  // = TITLE
-  //     Same as <ACE_Singleton>, except does _not_ register with
-  //     <ACE_Object_Manager> for destruction.
-  //
-  // = DESCRIPTION
-  //     This version of <ACE_Singleton> can be used if, for example,
-  //     its DLL will be unloaded before the <ACE_Object_Manager>
-  //     destroys the instance.  Unlike with <ACE_Singleton>, the
-  //     application is responsible for explicitly destroying the
-  //     instance after it is no longer needed (if it wants to avoid
-  //     memory leaks, at least).  The close () static member function
-  //     must be used to explicitly destroy the Singleton.
-  //
-public:
-  static TYPE *instance (void);
-  // Global access point to the Singleton.
-
-  static void close (void);
-  // Explicitly delete the Singleton instance.
-
-  static void dump (void);
-  // Dump the state of the object.
-
-protected:
-  ACE_Unmanaged_Singleton (void);
-  // Default constructor.
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *singleton_;
-  // Pointer to the Singleton (ACE_Cleanup) instance.
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
-  // Get pointer to the Singleton instance.
-};
-
-template <class TYPE, class ACE_LOCK>
 class ACE_TSS_Singleton : public ACE_Cleanup
 {
   // = TITLE
@@ -188,46 +149,6 @@ protected:
   // Get pointer to the TSS Singleton instance.
 };
 
-template <class TYPE, class ACE_LOCK>
-class ACE_Unmanaged_TSS_Singleton : public ACE_TSS_Singleton <TYPE, ACE_LOCK>
-{
-  // = TITLE
-  //     Same as <ACE_TSS_Singleton>, except does _not_ register with
-  //     <ACE_Object_Manager> for destruction.
-  //
-  // = DESCRIPTION
-  //     This version of <ACE_TSS_Singleton> can be used if, for
-  //     example, its DLL will be unloaded before the
-  //     <ACE_Object_Manager> destroys the instance.  Unlike with
-  //     <ACE_Singleton>, the application is responsible for
-  //     explicitly destroying the instance after it is no longer
-  //     needed (if it wants to avoid memory leaks, at least).  The
-  //     close () static member function must be used to explicitly
-  //     destroy the Singleton.
-  //
-public:
-  static TYPE *instance (void);
-  // Global access point to the Singleton.
-
-  static void close (void);
-  // Explicitly delete the Singleton instance.
-
-  static void dump (void);
-  // Dump the state of the object.
-
-protected:
-  ACE_Unmanaged_TSS_Singleton (void);
-  // Default constructor.
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *singleton_;
-  // Pointer to the Singleton (ACE_Cleanup) instance.
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
-  // Get pointer to the Singleton instance.
-};
-
 #if defined (__ACE_INLINE__)
 #include "ace/Singleton.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Singleton.i b/ace/Singleton.i
index 38e37fc3d7c..c49bd5a0428 100644
--- a/ace/Singleton.i
+++ b/ace/Singleton.i
@@ -1,6 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
+// Singleton.i
+
 // Default constructors.
 //
 // Note: don't explicitly initialize "instance_", because TYPE may not
@@ -12,16 +14,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::ACE_Singleton (void)
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_Singleton (void)
-{
-}
-
-template <class TYPE, class ACE_LOCK> ACE_INLINE
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::ACE_TSS_Singleton (void)
 {
 }
 
-template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_TSS_Singleton (void)
-{
-}
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index 658bd5ec12d..b025ba2e616 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -222,7 +222,7 @@ ACE_Stats::print_summary (const u_int precision,
       // Build a format string, in case the C library doesn't support %*u.
       ASYS_TCHAR format[32];
       if (tmp_precision == 0)
-        ACE_OS::sprintf (format, ASYS_TEXT ("%%%d"), tmp_precision);
+        ACE_OS::sprintf (format, ASYS_TEXT ("%%d"), tmp_precision);
       else
         ACE_OS::sprintf (format, ASYS_TEXT ("%%d.%%0%du"), tmp_precision);
 
@@ -547,8 +547,7 @@ ACE_Throughput_Stats::dump_results (const ASYS_TCHAR* msg,
 {
   if (this->samples_count_ == 0u)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s : no data collected\n"), msg));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s : no data collected\n")));
       return;
     }
 
diff --git a/ace/Strategies.h b/ace/Strategies.h
index 1574557cf37..474c23503ac 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -100,11 +100,6 @@ public:
   virtual int cache (const void *recycling_act) = 0;
   // Add to cache.
 
-  virtual int recycle_state (const void *recycling_act,
-                             ACE_Recyclable_State new_state) = 0;
-  virtual ACE_Recyclable_State recycle_state (const void *recycling_act) const = 0;
-  // Get/Set <recycle_state>.
-
   virtual int mark_as_closed (const void *recycling_act) = 0;
   // Mark as closed.
 
@@ -119,18 +114,36 @@ protected:
 class ACE_Export ACE_Recyclable
 {
 public:
+  enum State
+  {
+    IDLE_AND_PURGABLE,
+    // Idle and can be purged.
+
+    IDLE_BUT_NOT_PURGABLE,
+    // Idle but cannot be purged.
+
+    BUSY = 2,
+    // Busy (i.e., cannot be recycled or purged).
+
+    CLOSED = 3,
+    // Closed.
+
+    UNKNOWN = 4
+    // Unknown state.
+  };
+
   virtual ~ACE_Recyclable (void);
   // Destructor.
 
   // = Set/Get the recyclable bit
-  ACE_Recyclable_State recycle_state (void) const;
-  void recycle_state (ACE_Recyclable_State new_state);
+  State state (void) const;
+  void state (State new_state);
 
 protected:
-  ACE_Recyclable (ACE_Recyclable_State initial_state);
+  ACE_Recyclable (State initial_state);
   // Protected constructor.
 
-  ACE_Recyclable_State recycle_state_;
+  State state_;
   // Our state.
 };
 
diff --git a/ace/Strategies.i b/ace/Strategies.i
index d970ef75f65..2d101275030 100644
--- a/ace/Strategies.i
+++ b/ace/Strategies.i
@@ -14,8 +14,8 @@ ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void)
 }
 
 ACE_INLINE
-ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
-  : recycle_state_ (initial_state)
+ACE_Recyclable::ACE_Recyclable (ACE_Recyclable::State initial_state)
+  : state_ (initial_state)
 {
 }
 
@@ -24,25 +24,25 @@ ACE_Recyclable::~ACE_Recyclable (void)
 {
 }
 
-ACE_INLINE ACE_Recyclable_State
-ACE_Recyclable::recycle_state (void) const
+ACE_INLINE ACE_Recyclable::State 
+ACE_Recyclable::state (void) const
 {
-  return this->recycle_state_;
+  return this->state_;
 }
 
-ACE_INLINE void
-ACE_Recyclable::recycle_state (ACE_Recyclable_State new_state)
+ACE_INLINE void 
+ACE_Recyclable::state (ACE_Recyclable::State new_state)
 {
-  this->recycle_state_ = new_state;
+  this->state_ = new_state;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Hashable::ACE_Hashable (void)
   : hash_value_ (0)
 {
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Hashable::~ACE_Hashable (void)
 {
 }
@@ -62,13 +62,13 @@ ACE_Hashable::hash (void) const
   return this->hash_value_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Refcountable::ACE_Refcountable (int refcount)
   : refcount_ (refcount)
 {
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Refcountable::~ACE_Refcountable (void)
 {
 }
@@ -79,14 +79,15 @@ ACE_Refcountable::increment (void)
   return ++this->refcount_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Refcountable::decrement (void)
 {
   return --this->refcount_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Refcountable::refcount (void) const
 {
   return this->refcount_;
 }
+
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 9185bf10b2d..5bacb3db45e 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -228,9 +228,9 @@ ACE_Thread_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handler
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy
-(const ACE_PEER_ACCEPTOR_ADDR &local_addr,
- int restart,
- ACE_Reactor *reactor)
+  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+   int restart,
+   ACE_Reactor *reactor)
   : reactor_ (reactor)
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy");
@@ -243,7 +243,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
-(SVC_HANDLER *svc_handler)
+  (SVC_HANDLER *svc_handler)
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler");
 
@@ -271,13 +271,13 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
 ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
 
@@ -292,14 +292,14 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
 ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
-(SVC_HANDLER *&sh,
- SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   SVC_HANDLER *&sh_copy,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
 
@@ -368,20 +368,19 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX>
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cached_Connect_Strategy
-(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
- ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
- ACE_Recycling_Strategy<SVC_HANDLER> *rec_s,
- MUTEX *lock,
- int delete_lock)
-  : lock_ (lock),
-    delete_lock_ (delete_lock),
-    reverse_lock_ (0),
-    creation_strategy_ (0),
-    delete_creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    delete_concurrency_strategy_ (0),
-    recycling_strategy_ (0),
-    delete_recycling_strategy_ (0)
+  (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+   ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+   ACE_Recycling_Strategy<SVC_HANDLER> *rec_s,
+   MUTEX *lock,
+   int delete_lock)
+    : lock_ (lock),
+      delete_lock_ (delete_lock),
+      creation_strategy_ (0),
+      delete_creation_strategy_ (0),
+      concurrency_strategy_ (0),
+      delete_concurrency_strategy_ (0),
+      recycling_strategy_ (0),
+      delete_recycling_strategy_ (0)
 {
   // Create a new lock if necessary.
   if (this->lock_ == 0)
@@ -392,9 +391,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache
       this->delete_lock_ = 1;
     }
 
-  ACE_NEW (this->reverse_lock_,
-           REVERSE_MUTEX (*this->lock_));
-
   if (this->open (cre_s, con_s, rec_s) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
@@ -407,8 +403,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
   if (this->delete_lock_)
     delete this->lock_;
 
-  delete this->reverse_lock_;
-
   if (this->delete_creation_strategy_)
     delete this->creation_strategy_;
   this->delete_creation_strategy_ = 0;
@@ -426,7 +420,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
 
   // Close down all cached service handlers.
   CONNECTION_MAP_ENTRY *entry;
-  for (CONNECTION_MAP_ITERATOR iterator (connection_map_);
+  for (CONNECTION_MAP_ITERATOR iterator (connection_cache_);
        iterator.next (entry);
        iterator.advance ())
     {
@@ -437,9 +431,9 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
-(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
- ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
- ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
+  (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+   ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+   ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
 {
   // Initialize the creation strategy.
 
@@ -507,15 +501,15 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hint_i
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms,
- ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
- int &found)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms,
+   ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
+   int &found)
 {
   ACE_UNUSED_ARG (remote_addr);
   ACE_UNUSED_ARG (timeout);
@@ -530,7 +524,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin
   CONNECTION_MAP_ENTRY *possible_entry = (CONNECTION_MAP_ENTRY *) sh->recycling_act ();
 
   // Check to see if the hint svc_handler has been closed down
-  if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED)
+  if (possible_entry->ext_id_.state () == ACE_Recyclable::CLOSED)
     {
       // If close, decrement refcount
       if (possible_entry->ext_id_.decrement () == 0)
@@ -550,9 +544,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin
 
   // If hint is not closed, see if it is connected to the correct
   // address and is recyclable
-  else if ((possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
-            possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) &&
-           possible_entry->ext_id_.subject () == remote_addr)
+  else if (possible_entry->ext_id_ == remote_addr)
     {
       // Hint successful
       found = 1;
@@ -582,22 +574,22 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_create_svc_handler_i
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms,
- ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
- int &found)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms,
+   ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
+   int &found)
 {
   // Explicit type conversion
   REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr);
 
   // Try to find the address in the cache.  Only if we don't find it
   // do we create a new <SVC_HANDLER> and connect it with the server.
-  if (this->find (search_addr, entry) == -1)
+  if (this->connection_cache_.find (search_addr, entry) == -1)
     {
       // Set the flag
       found = 0;
@@ -608,13 +600,13 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c
 
       // Actively establish the connection.  This is a timed blocking
       // connect.
-      if (this->new_connection (sh,
-                                remote_addr,
-                                timeout,
-                                local_addr,
-                                reuse_addr,
-                                flags,
-                                perms) == -1)
+      if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                       remote_addr,
+                                                       timeout,
+                                                       local_addr,
+                                                       reuse_addr,
+                                                       flags,
+                                                       perms) == -1)
         {
           // If connect() failed because of timeouts, we have to
           // reject the connection entirely. This is necessary since
@@ -628,9 +620,9 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c
       else
         {
           // Insert the new SVC_HANDLER instance into the cache.
-          if (this->connection_map_.bind (search_addr,
-                                          sh,
-                                          entry) == -1)
+          if (this->connection_cache_.bind (search_addr,
+                                            sh,
+                                            entry) == -1)
             return -1;
 
           // Set the recycler and the recycling act
@@ -655,38 +647,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::new_connection
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
-{
-  // Yow, Reverse Guard!  Let go of the lock for the duration of the
-  // actual connect.  This will allow other threads to hack on the
-  // connection cache while this thread creates the new connection.
-  ACE_GUARD_RETURN (REVERSE_MUTEX, ace_mon, *this->reverse_lock_, -1);
-
-  return this->CONNECT_STRATEGY::connect_svc_handler (sh,
-                                                      remote_addr,
-                                                      timeout,
-                                                      local_addr,
-                                                      reuse_addr,
-                                                      flags,
-                                                      perms);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_svc_handler
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   int found = 0;
 
@@ -730,14 +698,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_svc_handler
-(SVC_HANDLER *&sh,
- SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   SVC_HANDLER *&sh_copy,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   int found = 0;
 
@@ -783,14 +751,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_svc_handler_i
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms,
- int& found)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms,
+   int& found)
 {
   CONNECTION_MAP_ENTRY *entry = 0;
 
@@ -828,7 +796,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
   // For all successful cases: mark the <svc_handler> in the cache
   // as being <in_use>.  Therefore recyclable is BUSY.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_BUSY);
+  entry->ext_id_.state (ACE_Recyclable::BUSY);
 
   // And increment the refcount
   entry->ext_id_.increment ();
@@ -855,62 +823,12 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cache_i (
 
   // Mark the <svc_handler> in the cache as not being <in_use>.
   // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE);
+  entry->ext_id_.state (ACE_Recyclable::IDLE_AND_PURGABLE);
 
   return 0;
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state (const void *recycling_act,
-                                                                                      ACE_Recyclable_State new_state)
-{
-  // Synchronization is required here as the setting of the recyclable
-  // state must be done atomically with respect to other threads that
-  // are querying the cache.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1);
-
-  return this->recycle_state_i (recycling_act,
-                                new_state);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state_i (const void *recycling_act,
-                                                                                        ACE_Recyclable_State new_state)
-{
-  // The wonders and perils of ACT
-  CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (new_state);
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Recyclable_State
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state (const void *recycling_act) const
-{
-  // Const cast.
-  SELF *fake_this = ACE_const_cast (SELF *, this);
-
-  // Synchronization is required here.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, *fake_this->lock_, ACE_RECYCLABLE_UNKNOWN);
-
-  return this->recycle_state_i (recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Recyclable_State
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state_i (const void *recycling_act) const
-{
-  // The wonders and perils of ACT
-  CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  return entry->ext_id_.recycle_state ();
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::purge (const void *recycling_act)
 {
   // Excluded other threads from changing cache while we take this
@@ -926,7 +844,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::purge_i (
   // The wonders and perils of ACT
   CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
 
-  return this->connection_map_.unbind (entry);
+  return this->connection_cache_.unbind (entry);
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
@@ -946,7 +864,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::mark_as_c
   CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
 
   // Mark the <svc_handler> in the cache as CLOSED.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_CLOSED);
+  entry->ext_id_.state (ACE_Recyclable::CLOSED);
 
   return 0;
 }
@@ -972,7 +890,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cleanup_h
 
   // If the svc_handler state is closed and the refcount == 0, call
   // close() on svc_handler.
-  if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED &&
+  if (entry->ext_id_.state () == ACE_Recyclable::CLOSED &&
       refcount == 0)
     {
       entry->int_id_->recycler (0, 0);
@@ -1001,44 +919,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::concurren
   return this->concurrency_strategy_;
 }
 
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-                                                                             ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry)
-{
-  typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                       SVC_HANDLER *,
-                                       ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Null_Mutex>
-    CONNECTION_MAP_BUCKET_ITERATOR;
-
-  CONNECTION_MAP_BUCKET_ITERATOR iterator (this->connection_map_,
-                                           search_addr);
-
-  CONNECTION_MAP_BUCKET_ITERATOR end (this->connection_map_,
-                                      search_addr,
-                                      1);
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      REFCOUNTED_HASH_RECYCLABLE_ADDRESS &addr = (*iterator).ext_id_;
-
-      if (addr.recycle_state () != ACE_RECYCLABLE_IDLE_AND_PURGABLE &&
-          addr.recycle_state () != ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE)
-        continue;
-
-      if (addr.subject () != search_addr.subject ())
-        continue;
-
-      entry = &(*iterator);
-      return 0;
-    }
-
-  return -1;
-}
-
 template <class SVC_HANDLER> void
 ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const
 {
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index ab700219755..fdb2ad5ca96 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -649,17 +649,17 @@ public:
 
   ACE_Refcounted_Hash_Recyclable (const T &t,
                                   int refcount = 0,
-                                  ACE_Recyclable_State state = ACE_RECYCLABLE_UNKNOWN);
+                                  ACE_Recyclable::State state = ACE_Recyclable::UNKNOWN);
   // Constructor.
 
   virtual ~ACE_Refcounted_Hash_Recyclable (void);
   // Destructor
 
   int operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const;
-  int operator!= (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const;
   // Compares two instances.
 
-  T &subject ();
+  int operator== (const T &rhs) const;
+  // Compares two instances.
 
 protected:
   u_long hash_i (void) const;
@@ -682,8 +682,6 @@ class ACE_Cached_Connect_Strategy : public ACE_Connection_Recycling_Strategy, pu
   //     It's added value is re-use of established connections.
 public:
 
-  typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> SELF;
-
   ACE_Cached_Connect_Strategy (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0,
                                ACE_Concurrency_Strategy<SVC_HANDLER> *con_s = 0,
                                ACE_Recycling_Strategy<SVC_HANDLER> *rec_s = 0,
@@ -749,11 +747,6 @@ public:
   virtual int cache (const void *recycling_act);
   // Add to cache.
 
-  virtual int recycle_state (const void *recycling_act,
-                             ACE_Recyclable_State new_state);
-  virtual ACE_Recyclable_State recycle_state (const void *recycling_act) const;
-  // Get/Set <recycle_state>.
-
   virtual int mark_as_closed (const void *recycling_act);
   // Mark as closed.
 
@@ -775,15 +768,13 @@ public:
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-  typedef ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
+  typedef ACE_Hash_Map_Manager <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
           CONNECTION_MAP;
-  typedef ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
+  typedef ACE_Hash_Map_Iterator <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
           CONNECTION_MAP_ITERATOR;
   typedef ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *>
           CONNECTION_MAP_ENTRY;
 
-  typedef ACE_Reverse_Lock<MUTEX> REVERSE_MUTEX;
-
   // = Strategy accessors
   virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const;
   virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy (void) const;
@@ -791,30 +782,12 @@ public:
 
 protected:
 
-  virtual int new_connection (SVC_HANDLER *&sh,
-                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                              ACE_Time_Value *timeout,
-                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                              int reuse_addr,
-                              int flags,
-                              int perms);
-  // Creates a new connection.
-
-  int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-            ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry);
-  // Find an idle handle.
-
   virtual int purge_i (const void *recycling_act);
   // Remove from cache (non-locking version).
 
   virtual int cache_i (const void *recycling_act);
   // Add to cache (non-locking version).
 
-  virtual int recycle_state_i (const void *recycling_act,
-                               ACE_Recyclable_State new_state);
-  virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const;
-  // Get/Set <recycle_state> (non-locking version).
-
   virtual int mark_as_closed_i (const void *recycling_act);
   // Mark as closed (non-locking version).
 
@@ -832,6 +805,15 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
                     int &found);
 
+  virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
+                             const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                             ACE_Time_Value *timeout,
+                             const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                             int reuse_addr,
+                             int flags,
+                             int perms,
+                             int &found);
+
   int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                     ACE_Time_Value *timeout,
@@ -842,16 +824,7 @@ protected:
                                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
                                     int &found);
 
-  virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
-                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                                     ACE_Time_Value *timeout,
-                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                     int reuse_addr,
-                                     int flags,
-                                     int perms,
-                                     int &found);
-
-  CONNECTION_MAP connection_map_;
+  CONNECTION_MAP connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.
 
   MUTEX *lock_;
@@ -860,9 +833,6 @@ protected:
   int delete_lock_;
   // Mutual exclusion for this object.
 
-  REVERSE_MUTEX *reverse_lock_;
-  // Reverse lock.
-
   // = Strategy objects.
 
   CREATION_STRATEGY *creation_strategy_;
diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i
index 80932a5ea73..dae0ed6bd10 100644
--- a/ace/Strategies_T.i
+++ b/ace/Strategies_T.i
@@ -333,7 +333,7 @@ template <class T> ASYS_INLINE
 ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
   : ACE_Refcountable (0),
     ACE_Hashable (),
-    ACE_Recyclable (ACE_RECYCLABLE_UNKNOWN),
+    ACE_Recyclable (ACE_Recyclable::UNKNOWN),
     t_ ()
 {
 }
@@ -341,7 +341,7 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
 template <class T> ASYS_INLINE
 ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t,
                                                                    int refcount,
-                                                                   ACE_Recyclable_State state)
+                                                                   ACE_Recyclable::State state)
   : ACE_Refcountable (refcount),
     ACE_Hashable (),
     ACE_Recyclable (state),
@@ -360,23 +360,24 @@ ACE_Refcounted_Hash_Recyclable<T>::hash_i (void) const
   return this->t_.hash ();
 }
 
-template <class T> ASYS_INLINE T &
-ACE_Refcounted_Hash_Recyclable<T>::subject (void)
-{
-  return this->t_;
-}
-
 template <class T> ASYS_INLINE int
 ACE_Refcounted_Hash_Recyclable<T>::operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const
 {
-  return this->recycle_state () == rhs.recycle_state () &&
-         this->t_ == rhs.t_;
+  if (this->state () != ACE_Recyclable::IDLE_AND_PURGABLE &&
+      this->state () != ACE_Recyclable::IDLE_BUT_NOT_PURGABLE)
+    return 0;
+  else
+    return this->t_ == rhs.t_;
 }
 
 template <class T> ASYS_INLINE int
-ACE_Refcounted_Hash_Recyclable<T>::operator!= (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const
+ACE_Refcounted_Hash_Recyclable<T>::operator== (const T &rhs) const
 {
-  return !this->operator== (rhs);
+  if (this->state () != ACE_Recyclable::IDLE_AND_PURGABLE &&
+      this->state () != ACE_Recyclable::IDLE_BUT_NOT_PURGABLE)
+    return 0;
+  else
+    return this->t_ == rhs;
 }
 
 template <class SVC_HANDLER> ASYS_INLINE int
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index ce9a3f1861e..83262666129 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -300,25 +300,6 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::idle (u_long flags)
     return this->close (flags);
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (ACE_Recyclable_State new_state)
-{
-  if (this->recycler ())
-    return this->recycler ()->recycle_state (this->recycling_act_,
-                                             new_state);
-
-  return 0;
-}
-
-template <PR_ST_1, ACE_SYNCH_DECL> ACE_Recyclable_State
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (void) const
-{
-  if (this->recycler ())
-    return this->recycler ()->recycle_state (this->recycling_act_);
-
-  return ACE_RECYCLABLE_UNKNOWN;
-}
-
 template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler (ACE_Connection_Recycling_Strategy *recycler,
                                                    const void *recycling_act)
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index c15a97c5009..a1251999404 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -71,13 +71,6 @@ public:
   // instead of closing it.  If the object does not have a recycler,
   // it will be closed.
 
-  virtual ACE_Recyclable_State recycle_state (void) const;
-  virtual int recycle_state (ACE_Recyclable_State new_state);
-  // Call this method if you want to get/set the state of the
-  // <Svc_Handler>.  If the object does not have a recycler, this call
-  // will have no effect (and the accessor will return
-  // ACE_RECYCLABLE_UNKNOWN).
-
   virtual void cleanup_hint (void);
   // When the svc_handle is no longer needed around as a hint, call
   // this method.
@@ -145,7 +138,7 @@ public:
 
 public:
 
-  // = The following methods are not suppose to be public.
+  // = The following methods are not suppose to be public.  
 
   // Because friendship is *not* inherited in C++, these methods have
   // to be public.
@@ -245,7 +238,7 @@ protected:
 
   size_t current_buffer_size_;
   // Current size in bytes of the <Message_Queue> contents.
-
+  
   ACE_Time_Value next_timeout_;
   // Timeout value used to control when the buffer is flushed.
 
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 3219887276a..2c75b420838 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -39,6 +39,8 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void)
 template <class ACE_LOCKING_MECHANISM>
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
 {
+  if (this->delete_lock_)
+    delete this->lock_;
 }
 
 template <class ACE_LOCK, class TYPE>
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index fecba0de29d..b89d1b0a707 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -108,14 +108,14 @@ class ACE_Reverse_Lock : public ACE_Lock
   //     on the lock, and release() on this class calls acquire() on
   //     the lock.
   //
-  //     One motivation for this class is when we temporarily want to
-  //     release a lock (which we have already acquired) but then
-  //     reaquire it soon after.  An alternative design would be to
-  //     add a Anti_Guard or Reverse_Guard class which would release()
-  //     on construction and acquire() destruction.  However, there
-  //     are *many* varieties of the Guard class and this design
-  //     choice would lead to at least 6 new classes.  One new
-  //     ACE_Reverse_Lock class seemed more reasonable.
+  //  	 One motivation for this class is when we temporarily want to
+  //  	 release a lock (which we have already acquired) but then
+  //  	 reaquire it soon after.  An alternative design would be to
+  //  	 add a Anti_Guard or Reverse_Guard class which would release()
+  //  	 on construction and acquire() destruction.  However, there
+  //  	 are *many* varieties of the Guard class and this design
+  //  	 choice would lead to at least 6 new classes.  One new
+  //  	 ACE_Reverse_Lock class seemed more reasonable.
 public:
   typedef ACE_LOCKING_MECHANISM ACE_LOCK;
 
@@ -154,8 +154,12 @@ public:
   // Explicitly destroy the lock.
 
 private:
-  ACE_LOCKING_MECHANISM &lock_;
+  ACE_LOCKING_MECHANISM *lock_;
   // The concrete locking mechanism that all the methods delegate to.
+
+  int delete_lock_;
+  // This flag keep track of whether we are responsible for deleting
+  // the lock
 };
 
 template <class ACE_LOCK, class TYPE>
diff --git a/ace/Synch_T.i b/ace/Synch_T.i
index cb190580243..52445c8750b 100644
--- a/ace/Synch_T.i
+++ b/ace/Synch_T.i
@@ -163,7 +163,8 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
 
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock)
-  : lock_ (lock)
+  : lock_ (&lock),
+    delete_lock_ (0)
 {
 }
 
@@ -171,56 +172,56 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove (void)
 {
-  return this->lock_.remove ();
+  return this->lock_->remove ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire (void)
 {
-  return this->lock_.release ();
+  return this->lock_->release ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire (void)
 {
-  return this->lock_.tryacquire ();
+  return this->lock_->tryacquire ();
 }
 
 // Acquire the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void)
 {
-  return this->lock_.acquire ();
+  return this->lock_->acquire ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read (void)
 {
-  return this->lock_.acquire_read ();
+  return this->lock_->acquire_read ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write (void)
 {
-  return this->lock_.acquire_write ();
+  return this->lock_->acquire_write ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read (void)
 {
-  return this->lock_.tryacquire_read ();
+  return this->lock_->tryacquire_read ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
 {
-  return this->lock_.tryacquire_write ();
+  return this->lock_->tryacquire_write ();
 }
 
 #if defined (ACE_HAS_THREADS)
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index 897f09a27ab..f50449e9b98 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -130,13 +130,6 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
       return -1;
     }
 
-  // After acquiring the lock, check if we have been deactivated.
-  if (this->deactivated_)
-    {
-      ACE_MT (this->token_.release ());
-      return -1;
-    }
-
   // We got the lock, lets handle some events.  Note: this method will
   // *not* dispatch any handlers.  It will dispatch timeouts and
   // signals.
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 37abc509eda..560cf96f404 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -615,10 +615,23 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
 
   // Create a new thread running <func>.  *Must* be called with the
   // <lock_> held...
+#if 1
   auto_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ());
   new_thr_desc->thr_state_ = ACE_THR_IDLE;
   // Get a "new" Thread Descriptor from the freelist.
 
+  new_thr_desc->sync_->acquire ();
+  // Acquire the <sync_> lock to block the spawned thread from
+  // removing this Thread Descriptor before it gets put into our
+  // thread table.
+#else
+  ACE_Thread_Descriptor *new_thr_desc = 0;
+
+  ACE_NEW_RETURN (new_thr_desc,
+                  ACE_Thread_Descriptor,
+                  -1);
+#endif /* 1 */
+
   ACE_Thread_Adapter *thread_args = 0;
 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
   ACE_NEW_RETURN (thread_args,
@@ -640,6 +653,13 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                   -1);
 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
+  // @@ Memory leak if the previous new failed, need an auto pointer here.
+  if (thread_args == 0)
+    {
+      this->thr_list_.insert_head (new_thr_desc.release ());
+      return -1;
+    }
+
   ACE_TRACE ("ACE_Thread_Manager::spawn_i");
   ACE_hthread_t thr_handle;
 
@@ -668,11 +688,6 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
     t_id = &thr_id;
 #endif /* ! VXWORKS */
 
-  new_thr_desc->sync_->acquire ();
-  // Acquire the <sync_> lock to block the spawned thread from
-  // removing this Thread Descriptor before it gets put into our
-  // thread table.
-
   int result = ACE_Thread::spawn (func,
                                   args,
                                   flags,
@@ -684,14 +699,10 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                                   thread_args);
 
   if (result != 0)
-    {
-      // _Don't_ clobber errno here!  result is either 0 or -1, and
-      // ACE_OS::thr_create () already set errno!  D. Levine 28 Mar 1997
-      // errno = result;
-      ACE_Errno_Guard guard (errno);     // Lock release may smash errno
-      new_thr_desc->sync_->release ();
-      return -1;
-    }
+    // _Don't_ clobber errno here!  result is either 0 or -1, and
+    // ACE_OS::thr_create () already set errno!  D. Levine 28 Mar 1997
+    // errno = result;
+    return -1;
   else
     {
 #if defined (ACE_HAS_WTHREADS)
diff --git a/ace/Timer_Queue.i b/ace/Timer_Queue.i
deleted file mode 100644
index 41e4324e61e..00000000000
--- a/ace/Timer_Queue.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- C++ -*- */
-
-template <class TYPE, class FUNCTOR> ACE_INLINE void
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (const ACE_Time_Value &skew)
-{
-  timer_skew_ = skew;
-}
-
-template <class TYPE, class FUNCTOR> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (void) const
-{
-  return timer_skew_;
-}
-
-template <class TYPE, class FUNCTOR> ACE_INLINE int
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::expire (void)
-{
-  if (!this->is_empty ())
-    return this->expire (this->gettimeofday () + timer_skew_);
-  else
-    return 0;
-}
diff --git a/ace/Version.h b/ace/Version.h
index 63f35fbb750..5def819a690 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 4
 #define ACE_MINOR_VERSION 6
-#define ACE_BETA_VERSION 46
-#define ACE_VERSION "4.6.46"
+#define ACE_BETA_VERSION 43
+#define ACE_VERSION "4.6.43"
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index c41cf1ffa91..6fea6727a00 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -185,8 +185,8 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
-                                               ACE_Reactor_Mask mask,
-                                               int &changes_required)
+					       ACE_Reactor_Mask mask,
+					       int &changes_required)
 {
   int error = 0;
 
@@ -257,7 +257,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
-                                                       ACE_Reactor_Mask to_be_removed_masks)
+						       ACE_Reactor_Mask to_be_removed_masks)
 {
   // I/O entries
   if (this->current_info_[slot].io_entry_)
@@ -274,8 +274,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
       // think we can do anything about errors here, so I will not
       // check this.
       ::WSAEventSelect ((SOCKET) this->current_info_[slot].io_handle_,
-                        this->current_handles_[slot],
-                        this->current_info_[slot].network_events_);
+			this->current_handles_[slot],
+			this->current_info_[slot].network_events_);
     }
   // Normal event entries.
   else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
@@ -295,7 +295,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
       // Remember the mask
       this->current_info_[slot].close_masks_ = to_be_removed_masks;
       // Increment the handle count
-      this->handles_to_be_deleted_++;
+          this->handles_to_be_deleted_++;
     }
 
   // Since it is not a complete removal, we'll call handle_close
@@ -315,7 +315,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
-                                                                 ACE_Reactor_Mask to_be_removed_masks)
+								 ACE_Reactor_Mask to_be_removed_masks)
 {
   // I/O entries
   if (this->current_suspended_info_[slot].io_entry_)
@@ -332,8 +332,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
       // think we can do anything about errors here, so I will not
       // check this.
       ::WSAEventSelect ((SOCKET) this->current_suspended_info_[slot].io_handle_,
-                        this->current_suspended_info_[slot].event_handle_,
-                        this->current_suspended_info_[slot].network_events_);
+			this->current_suspended_info_[slot].event_handle_,
+			this->current_suspended_info_[slot].network_events_);
     }
   // Normal event entries.
   else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
@@ -389,8 +389,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
       // think we can do anything about errors here, so I will not
       // check this.
       ::WSAEventSelect ((SOCKET) this->to_be_added_info_[slot].io_handle_,
-                        this->to_be_added_info_[slot].event_handle_,
-                        this->to_be_added_info_[slot].network_events_);
+			this->to_be_added_info_[slot].event_handle_,
+			this->to_be_added_info_[slot].network_events_);
     }
   // Normal event entries.
   else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
@@ -429,7 +429,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::suspend_handler_i (ACE_HANDLE handle,
-                                                        int &changes_required)
+							int &changes_required)
 {
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
@@ -478,7 +478,7 @@ ACE_WFMO_Reactor_Handler_Repository::suspend_handler_i (ACE_HANDLE handle,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle,
-                                                       int &changes_required)
+						       int &changes_required)
 {
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
@@ -564,11 +564,11 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_all (void)
 
 int
 ACE_WFMO_Reactor_Handler_Repository::bind_i (int io_entry,
-                                             ACE_Event_Handler *event_handler,
-                                             long network_events,
-                                             ACE_HANDLE io_handle,
-                                             ACE_HANDLE event_handle,
-                                             int delete_event)
+					     ACE_Event_Handler *event_handler,
+					     long network_events,
+					     ACE_HANDLE io_handle,
+					     ACE_HANDLE event_handle,
+					     int delete_event)
 {
   // Make sure that the <handle> is valid
   if (event_handle == ACE_INVALID_HANDLE)
@@ -587,11 +587,11 @@ ACE_WFMO_Reactor_Handler_Repository::bind_i (int io_entry,
       // Cache this set into the <to_be_added_info_>, till we come
       // around to actually adding this to the <current_info_>
       this->to_be_added_info_[this->handles_to_be_added_].set (event_handle,
-                                                               io_entry,
-                                                               event_handler,
-                                                               io_handle,
-                                                               network_events,
-                                                               delete_event);
+							       io_entry,
+							       event_handler,
+							       io_handle,
+							       network_events,
+							       delete_event);
 
       this->handles_to_be_added_++;
 
@@ -620,7 +620,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void)
       int last_valid_slot = this->max_handlep1_ - 1;
 
       for (int i = last_valid_slot; i >= 0; i--)
-        {
+	{
           // This stuff is necessary here, since we should not make
           // the upcall until all the internal data structures have
           // been updated.  This is to protect against upcalls that
@@ -629,75 +629,75 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void)
           ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK;
           ACE_Event_Handler *event_handler = 0;
 
-          // See if this entry is scheduled for deletion
-          if (this->current_info_[i].delete_entry_)
-            {
-              // Calling the <handle_close> method here will ensure that we
-              // will only call it once per deregistering <Event_Handler>.
-              // This is essential in the case when the <Event_Handler> will
-              // do something like delete itself and we have multiple
-              // threads in WFMO_Reactor.
-              //
-              // Make sure that the DONT_CALL mask is not set
-              masks = this->current_info_[i].close_masks_;
-              if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
-                {
-                  // Grab the correct handle depending on the type entry
-                  if (this->current_info_[i].io_entry_)
-                    handle = this->current_info_[i].io_handle_;
-                  else
-                    handle = this->current_handles_[i];
-
-                  // Event handler
-                  event_handler = this->current_info_[i].event_handler_;
-                }
-
-              // If <WFMO_Reactor> created the event, we need to clean it up
-              if (this->current_info_[i].delete_event_)
-                ACE_OS::event_destroy (&this->current_handles_[i]);
-
-              // Reduce count by one
-              this->handles_to_be_deleted_--;
-            }
-
-          // See if this entry is scheduled for suspension
-          else if (this->current_info_[i].suspend_entry_)
-            {
-              this->current_suspended_info_ [this->suspended_handles_].set (this->current_handles_[i],
-                                                                            this->current_info_[i]);
-              // Increase number of suspended handles
-              this->suspended_handles_++;
-
-              // Reduce count by one
-              this->handles_to_be_suspended_--;
-            }
-
-          // See if this entry is scheduled for deletion or suspension
-          // If so we need to clean up
-          if (this->current_info_[i].delete_entry_ || this->current_info_[i].suspend_entry_)
-            {
-              if (i == last_valid_slot)
-                // If this is the last handle in the set, no need to swap
-                // places. Simply remove it.
-                {
-                  // Reset the info in this slot
-                  this->current_info_[i].reset ();
-                  this->current_handles_[i] = ACE_INVALID_HANDLE;
-                }
-              else
-                // Swap this handle with the last valid handle
-                {
-                  // Struct copy
-                  this->current_info_[i] = this->current_info_[last_valid_slot];
-                  this->current_handles_[i] = this->current_handles_[last_valid_slot];
-                  // Reset the info in the last slot
-                  this->current_info_[last_valid_slot].reset ();
-                  this->current_handles_[last_valid_slot] = ACE_INVALID_HANDLE;
-                }
-              // Reset the last valid slot and clean up the entry in the
-              // <to_be_deleted_set_>
-              last_valid_slot--;
-            }
+	  // See if this entry is scheduled for deletion
+	  if (this->current_info_[i].delete_entry_)
+	    {
+	      // Calling the <handle_close> method here will ensure that we
+	      // will only call it once per deregistering <Event_Handler>.
+	      // This is essential in the case when the <Event_Handler> will
+	      // do something like delete itself and we have multiple
+	      // threads in WFMO_Reactor.
+	      //
+	      // Make sure that the DONT_CALL mask is not set
+	      masks = this->current_info_[i].close_masks_;
+	      if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
+		{
+		  // Grab the correct handle depending on the type entry
+		  if (this->current_info_[i].io_entry_)
+		    handle = this->current_info_[i].io_handle_;
+		  else
+		    handle = this->current_handles_[i];
+
+		  // Event handler
+		  event_handler = this->current_info_[i].event_handler_;
+		}
+
+	      // If <WFMO_Reactor> created the event, we need to clean it up
+	      if (this->current_info_[i].delete_event_)
+		ACE_OS::event_destroy (&this->current_handles_[i]);
+
+	      // Reduce count by one
+	      this->handles_to_be_deleted_--;
+	    }
+
+	  // See if this entry is scheduled for suspension
+	  else if (this->current_info_[i].suspend_entry_)
+	    {
+	      this->current_suspended_info_ [this->suspended_handles_].set (this->current_handles_[i],
+									    this->current_info_[i]);
+	      // Increase number of suspended handles
+	      this->suspended_handles_++;
+
+	      // Reduce count by one
+	      this->handles_to_be_suspended_--;
+	    }
+
+	  // See if this entry is scheduled for deletion or suspension
+	  // If so we need to clean up
+	  if (this->current_info_[i].delete_entry_ || this->current_info_[i].suspend_entry_)
+	    {
+	      if (i == last_valid_slot)
+		// If this is the last handle in the set, no need to swap
+		// places. Simply remove it.
+		{
+		  // Reset the info in this slot
+		  this->current_info_[i].reset ();
+		  this->current_handles_[i] = ACE_INVALID_HANDLE;
+		}
+	      else
+		// Swap this handle with the last valid handle
+		{
+		  // Struct copy
+		  this->current_info_[i] = this->current_info_[last_valid_slot];
+		  this->current_handles_[i] = this->current_handles_[last_valid_slot];
+		  // Reset the info in the last slot
+		  this->current_info_[last_valid_slot].reset ();
+		  this->current_handles_[last_valid_slot] = ACE_INVALID_HANDLE;
+		}
+	      // Reset the last valid slot and clean up the entry in the
+	      // <to_be_deleted_set_>
+	      last_valid_slot--;
+	    }
 
           // Now that all internal structures have been updated, make
           // the upcall.
@@ -721,7 +721,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void)
     {
       int last_valid_slot = this->suspended_handles_ - 1;
       for (i = last_valid_slot; i >= 0; i--)
-        {
+	{
           // This stuff is necessary here, since we should not make
           // the upcall until all the internal data structures have
           // been updated.  This is to protect against upcalls that
@@ -730,71 +730,71 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void)
           ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK;
           ACE_Event_Handler *event_handler = 0;
 
-          // See if this entry is scheduled for deletion
-          if (this->current_suspended_info_[i].delete_entry_)
-            {
-              // Calling the <handle_close> method here will ensure that we
-              // will only call it once per deregistering <Event_Handler>.
-              // This is essential in the case when the <Event_Handler> will
-              // do something like delete itself and we have multiple
-              // threads in WFMO_Reactor.
-              //
-              // Make sure that the DONT_CALL mask is not set
+	  // See if this entry is scheduled for deletion
+	  if (this->current_suspended_info_[i].delete_entry_)
+	    {
+	      // Calling the <handle_close> method here will ensure that we
+	      // will only call it once per deregistering <Event_Handler>.
+	      // This is essential in the case when the <Event_Handler> will
+	      // do something like delete itself and we have multiple
+	      // threads in WFMO_Reactor.
+	      //
+	      // Make sure that the DONT_CALL mask is not set
               masks = this->current_suspended_info_[i].close_masks_;
-              if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
-                {
-                  // Grab the correct handle depending on the type entry
-                  if (this->current_suspended_info_[i].io_entry_)
-                    handle = this->current_suspended_info_[i].io_handle_;
-                  else
-                    handle = this->current_suspended_info_[i].event_handle_;
-
-                  // Upcall
-                  event_handler = this->current_suspended_info_[i].event_handler_;
-                }
-
-              // If <WFMO_Reactor> created the event, we need to clean it up
-              if (this->current_suspended_info_[i].delete_event_)
-                ACE_OS::event_destroy (&this->current_suspended_info_[i].event_handle_);
-
-              // Reduce count by one
-              this->handles_to_be_deleted_--;
-            }
-
-          else if (this->current_suspended_info_[i].resume_entry_)
-            {
-              // Add to the end of the current handles set
-              this->current_handles_[this->max_handlep1_] = this->current_suspended_info_[i].event_handle_;
-              // Struct copy
-              this->current_info_[this->max_handlep1_].set (this->current_suspended_info_[i]);
-              this->max_handlep1_++;
-
-              // Reduce count by one
-              this->handles_to_be_resumed_--;
-            }
-
-          if (this->current_suspended_info_[i].resume_entry_ ||
-              this->current_suspended_info_[i].delete_entry_)
-            {
-              // Is this the last entry
-              if (i == last_valid_slot)
-                // Reset the <suspended> arrays entries
-                this->current_suspended_info_[i].reset ();
-              else
-                {
-                  // Struct copy
-                  this->current_suspended_info_[i] = this->current_suspended_info_[last_valid_slot];
-                  this->current_suspended_info_[last_valid_slot].reset ();
-                }
-              // Reduce the number of suspended handles
-              last_valid_slot--;
-            }
+	      if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
+		{
+		  // Grab the correct handle depending on the type entry
+		  if (this->current_suspended_info_[i].io_entry_)
+		    handle = this->current_suspended_info_[i].io_handle_;
+		  else
+		    handle = this->current_suspended_info_[i].event_handle_;
+
+		  // Upcall
+		  event_handler = this->current_suspended_info_[i].event_handler_;
+		}
+
+	      // If <WFMO_Reactor> created the event, we need to clean it up
+	      if (this->current_suspended_info_[i].delete_event_)
+		ACE_OS::event_destroy (&this->current_suspended_info_[i].event_handle_);
+
+	      // Reduce count by one
+	      this->handles_to_be_deleted_--;
+	    }
+
+	  else if (this->current_suspended_info_[i].resume_entry_)
+	    {
+	      // Add to the end of the current handles set
+	      this->current_handles_[this->max_handlep1_] = this->current_suspended_info_[i].event_handle_;
+	      // Struct copy
+	      this->current_info_[this->max_handlep1_].set (this->current_suspended_info_[i]);
+	      this->max_handlep1_++;
+
+	      // Reduce count by one
+	      this->handles_to_be_resumed_--;
+	    }
+
+	  if (this->current_suspended_info_[i].resume_entry_ ||
+	      this->current_suspended_info_[i].delete_entry_)
+	    {
+	      // Is this the last entry
+	      if (i == last_valid_slot)
+		// Reset the <suspended> arrays entries
+		this->current_suspended_info_[i].reset ();
+	      else
+		{
+		  // Struct copy
+		  this->current_suspended_info_[i] = this->current_suspended_info_[last_valid_slot];
+		  this->current_suspended_info_[last_valid_slot].reset ();
+		}
+	      // Reduce the number of suspended handles
+	      last_valid_slot--;
+	    }
 
           // Now that all internal structures have been updated, make
           // the upcall.
           if (event_handler != 0)
             event_handler->handle_close (handle, masks);
-        }
+	}
 
       // Reset <this->suspended_handles_>
       this->suspended_handles_ = last_valid_slot + 1;
@@ -960,7 +960,7 @@ ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &)
 }
 
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
-                                    ACE_Timer_Queue *tq)
+				    ACE_Timer_Queue *tq)
   : signal_handler_ (0),
     delete_signal_handler_ (0),
     timer_queue_ (0),
@@ -979,17 +979,16 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
     active_threads_ (0),
     owner_ (ACE_Thread::self ()),
     change_state_thread_ (0),
-    open_for_business_ (0),
-    deactivated_ (0)
+    open_for_business_ (0)
 {
   if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq) == -1)
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("WFMO_Reactor")));
 }
 
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size,
-                                    int unused,
-                                    ACE_Sig_Handler *sh,
-                                    ACE_Timer_Queue *tq)
+				    int unused,
+				    ACE_Sig_Handler *sh,
+				    ACE_Timer_Queue *tq)
   : signal_handler_ (0),
     delete_signal_handler_ (0),
     timer_queue_ (0),
@@ -1024,9 +1023,9 @@ ACE_WFMO_Reactor::current_info (ACE_HANDLE, size_t &)
 
 int
 ACE_WFMO_Reactor::open (size_t size,
-                        int unused,
-                        ACE_Sig_Handler *sh,
-                        ACE_Timer_Queue *tq,
+			int unused,
+			ACE_Sig_Handler *sh,
+			ACE_Timer_Queue *tq,
                         int disable_notify_pipe,
                         ACE_Reactor_Notify *notify)
 {
@@ -1086,8 +1085,8 @@ ACE_WFMO_Reactor::open (size_t size,
   // purposes
   if (this->handler_rep_.open (size + 2) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("opening handler repository")),
-                      -1);
+		       ASYS_TEXT ("opening handler repository")),
+		      -1);
   else
     this->delete_handler_rep_ = 1;
 
@@ -1112,16 +1111,16 @@ ACE_WFMO_Reactor::open (size_t size,
   if (this->notify_handler_->open (this, this->timer_queue_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("opening notify handler ")),
-                      -1);
+		       ASYS_TEXT ("opening notify handler ")),
+		      -1);
 
   // Register for <wakeup_all_threads> event
   if (this->register_handler (&this->wakeup_all_threads_handler_,
-                              this->wakeup_all_threads_.handle ()) == -1)
+			      this->wakeup_all_threads_.handle ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("registering thread wakeup handler")),
-                      -1);
+		       ASYS_TEXT ("registering thread wakeup handler")),
+		      -1);
 
   // Since we have added two handles into the handler repository,
   // update the <handler_repository_>
@@ -1214,9 +1213,9 @@ ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void)
 
 int
 ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
-                                      ACE_HANDLE io_handle,
-                                      ACE_Event_Handler *event_handler,
-                                      ACE_Reactor_Mask new_masks)
+				      ACE_HANDLE io_handle,
+				      ACE_Event_Handler *event_handler,
+				      ACE_Reactor_Mask new_masks)
 {
   // If this is a Winsock 1 system, the underlying event assignment will
   // not work, so don't try. Winsock 1 must use ACE_Select_Reactor for
@@ -1264,8 +1263,8 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
     }
 
   int result = ::WSAEventSelect ((SOCKET) io_handle,
-                                 event_handle,
-                                 new_network_events);
+				 event_handle,
+				 new_network_events);
   // If we had found the <Event_Handler> there is nothing more to do
   if (found)
     return result;
@@ -1348,10 +1347,10 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
     if (io_handle == this->current_info_[i].io_handle_ &&
         !this->current_info_[i].delete_entry_)
       {
-        found = 1;
-        modified_network_events = &this->current_info_[i].network_events_;
-        delete_event = this->current_info_[i].delete_event_;
-        event_handle = this->current_handles_[i];
+	found = 1;
+	modified_network_events = &this->current_info_[i].network_events_;
+	delete_event = this->current_info_[i].delete_event_;
+	event_handle = this->current_handles_[i];
       }
 
   // Then pass through the suspended handles
@@ -1362,10 +1361,10 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
     if (io_handle == this->current_suspended_info_[i].io_handle_ &&
         !this->current_suspended_info_[i].delete_entry_)
       {
-        found = 1;
-        modified_network_events = &this->current_suspended_info_[i].network_events_;
-        delete_event = this->current_suspended_info_[i].delete_event_;
-        event_handle = this->current_suspended_info_[i].event_handle_;
+	found = 1;
+	modified_network_events = &this->current_suspended_info_[i].network_events_;
+	delete_event = this->current_suspended_info_[i].delete_event_;
+	event_handle = this->current_suspended_info_[i].event_handle_;
       }
 
   // Then check the to_be_added handles
@@ -1376,10 +1375,10 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
     if (io_handle == this->to_be_added_info_[i].io_handle_ &&
         !this->to_be_added_info_[i].delete_entry_)
       {
-        found = 1;
-        modified_network_events = &this->to_be_added_info_[i].network_events_;
-        delete_event = this->to_be_added_info_[i].delete_event_;
-        event_handle = this->to_be_added_info_[i].event_handle_;
+	found = 1;
+	modified_network_events = &this->to_be_added_info_[i].network_events_;
+	delete_event = this->to_be_added_info_[i].delete_event_;
+	event_handle = this->to_be_added_info_[i].event_handle_;
       }
 
   old_masks = this->bit_ops (*modified_network_events,
@@ -1395,12 +1394,12 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
 // max_wait_time expired, or the number of events that were dispatched.
 int
 ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time,
-                                  int alertable)
+				  int alertable)
 {
   ACE_TRACE ("ACE_WFMO_Reactor::event_handling");
 
   // Make sure we are not closed
-  if (!this->open_for_business_ || this->deactivated_)
+  if (!this->open_for_business_)
     return -1;
 
   // Stash the current time -- the destructor of this object will
@@ -1430,7 +1429,7 @@ ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time,
 
   // Wait for event to happen
   int wait_status = this->wait_for_multiple_events (timeout,
-                                                    alertable);
+						    alertable);
 
   // Upcall
   result = this->safe_dispatch (wait_status);
@@ -1440,7 +1439,7 @@ ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time,
 
 int
 ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
-                              int alertable)
+			      int alertable)
 {
   // Calculate the max time we should spend here
   //
@@ -1457,15 +1456,15 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
       // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't
       // do async I/O, so it's not needed in this case anyway.
       result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
-                                         this->atomic_wait_array_,
-                                         TRUE,
-                                         timeout);
+					 this->atomic_wait_array_,
+					 TRUE,
+					 timeout);
 #else
       result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
-                                           this->atomic_wait_array_,
-                                           TRUE,
-                                           timeout,
-                                           alertable);
+					   this->atomic_wait_array_,
+					   TRUE,
+					   timeout,
+					   alertable);
 #endif /* ACE_HAS_PHARLAP */
 
       if (result != WAIT_IO_COMPLETION)
@@ -1501,15 +1500,15 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout,
   // WaitForMultipleObjectsEx, so use WaitForMultipleObjects.
   ACE_UNUSED_ARG (alertable);
   return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (),
-                                   this->handler_rep_.handles (),
-                                   FALSE,
-                                   timeout);
+				   this->handler_rep_.handles (),
+				   FALSE,
+				   timeout);
 #else
   return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (),
-                                     this->handler_rep_.handles (),
-                                     FALSE,
-                                     timeout,
-                                     alertable);
+				     this->handler_rep_.handles (),
+				     FALSE,
+				     timeout,
+				     alertable);
 #endif /* ACE_HAS_PHARLAP */
 }
 
@@ -1602,11 +1601,11 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
     {
       bool ok = (
 #if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530))
-                 // wait_status is unsigned in Borland;
-                 // This >= is always true, with a warning.
-                 wait_status >= WAIT_OBJECT_0 &&
+		 // wait_status is unsigned in Borland;
+		 // This >= is always true, with a warning.
+		 wait_status >= WAIT_OBJECT_0 &&
 #endif
-                 wait_status <= (WAIT_OBJECT_0 + nCount));
+		 wait_status <= (WAIT_OBJECT_0 + nCount));
       if (ok)
         dispatch_slot += wait_status - WAIT_OBJECT_0;
       else
@@ -1622,7 +1621,7 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
 
       // We're done.
       if (dispatch_slot >= max_handlep1)
-        return number_of_handlers_dispatched;
+	return number_of_handlers_dispatched;
 
       // Readjust nCount
       nCount = max_handlep1 - dispatch_slot;
@@ -1630,14 +1629,14 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
       // Check the remaining handles
       wait_status = this->poll_remaining_handles (dispatch_slot);
       switch (wait_status)
-        {
-        case WAIT_FAILED: // Failure.
+	{
+	case WAIT_FAILED: // Failure.
           ACE_OS::set_errno_to_last_error ();
-          /* FALLTHRU */
-        case WAIT_TIMEOUT:
-          // There are no more handles ready, we can return.
-          return number_of_handlers_dispatched;
-        }
+	  /* FALLTHRU */
+	case WAIT_TIMEOUT:
+	  // There are no more handles ready, we can return.
+	  return number_of_handlers_dispatched;
+	}
     }
 }
 
@@ -1673,7 +1672,7 @@ ACE_WFMO_Reactor::dispatch_handler (size_t slot,
 
 int
 ACE_WFMO_Reactor::simple_dispatch_handler (int slot,
-                                           ACE_HANDLE event_handle)
+					   ACE_HANDLE event_handle)
 {
   // This dispatch is used for non-I/O entires
 
@@ -1693,7 +1692,7 @@ ACE_WFMO_Reactor::simple_dispatch_handler (int slot,
 
 int
 ACE_WFMO_Reactor::complex_dispatch_handler (int slot,
-                                            ACE_HANDLE event_handle)
+					    ACE_HANDLE event_handle)
 {
   // This dispatch is used for I/O entires.
 
@@ -1713,9 +1712,9 @@ ACE_WFMO_Reactor::complex_dispatch_handler (int slot,
 
 ACE_Reactor_Mask
 ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
-                          ACE_HANDLE io_handle,
-                          ACE_HANDLE event_handle,
-                          long interested_events)
+			  ACE_HANDLE io_handle,
+			  ACE_HANDLE event_handle,
+			  long interested_events)
 {
   // This method figures out what exactly has happened to the socket
   // and then calls appropriate methods.
@@ -1723,8 +1722,8 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
   WSANETWORKEVENTS events;
 
   if (::WSAEnumNetworkEvents ((SOCKET) io_handle,
-                              event_handle,
-                              &events) == SOCKET_ERROR)
+			      event_handle,
+			      &events) == SOCKET_ERROR)
     // Remove all masks
     return ACE_Event_Handler::ALL_EVENTS_MASK;
   else
@@ -1749,8 +1748,8 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
         ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK);
 
       if (interested_events & actual_events & FD_CONNECT)
-        {
-          if (events.iErrorCode[FD_CONNECT_BIT] == 0)
+	{
+	  if (events.iErrorCode[FD_CONNECT_BIT] == 0)
             {
               // Successful connect
               if (event_handler->handle_output (io_handle) == -1)
@@ -1758,9 +1757,9 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
                               ACE_Event_Handler::CONNECT_MASK);
             }
           // Unsuccessful connect
-          else if (event_handler->handle_input (io_handle) == -1)
+	  else if (event_handler->handle_input (io_handle) == -1)
             ACE_SET_BITS (problems, ACE_Event_Handler::CONNECT_MASK);
-        }
+	}
 
       if ((interested_events & actual_events & FD_OOB)
           && event_handler->handle_exception (io_handle) == -1)
@@ -1792,44 +1791,44 @@ ACE_WFMO_Reactor::update_state (void)
   if (this->handler_rep_.changes_required () || this->new_owner ())
     {
       if (this->change_state_thread_ == 0)
-        // Try to become the thread which will be responsible for the
-        // changes
-        {
-          this->change_state_thread_ = ACE_Thread::self ();
-          // Make sure no new threads are allowed to enter
-          this->ok_to_wait_.reset ();
-
-          if (this->active_threads_ > 0)
-            // Check for other active threads
-            {
-              // Wake up all other threads
-              this->wakeup_all_threads_.signal ();
-              // Release <lock_>
-              monitor.release ();
-              // Go to sleep waiting for all other threads to get done
-              this->waiting_to_change_state_.wait ();
-              // Re-acquire <lock_> again
-              monitor.acquire ();
-            }
-
-          if (this->handler_rep_.changes_required ())
-            // Make necessary changes to the handler repository
-            this->handler_rep_.make_changes ();
-          if (this->new_owner ())
-            // Update the owner
-            this->change_owner ();
-          // Turn off <wakeup_all_threads_>
-          this->wakeup_all_threads_.reset ();
-          // Let everyone know that it is ok to go ahead
-          this->ok_to_wait_.signal ();
-          // Reset this flag
-          this->change_state_thread_ = 0;
-        }
+	// Try to become the thread which will be responsible for the
+	// changes
+	{
+	  this->change_state_thread_ = ACE_Thread::self ();
+	  // Make sure no new threads are allowed to enter
+	  this->ok_to_wait_.reset ();
+
+	  if (this->active_threads_ > 0)
+	    // Check for other active threads
+	    {
+	      // Wake up all other threads
+	      this->wakeup_all_threads_.signal ();
+	      // Release <lock_>
+	      monitor.release ();
+	      // Go to sleep waiting for all other threads to get done
+	      this->waiting_to_change_state_.wait ();
+	      // Re-acquire <lock_> again
+	      monitor.acquire ();
+	    }
+
+	  if (this->handler_rep_.changes_required ())
+	    // Make necessary changes to the handler repository
+	    this->handler_rep_.make_changes ();
+	  if (this->new_owner ())
+	    // Update the owner
+	    this->change_owner ();
+	  // Turn off <wakeup_all_threads_>
+	  this->wakeup_all_threads_.reset ();
+	  // Let everyone know that it is ok to go ahead
+	  this->ok_to_wait_.signal ();
+	  // Reset this flag
+	  this->change_state_thread_ = 0;
+	}
       else if (this->active_threads_ == 0)
-        // This thread did not get a chance to become the change
-        // thread. If it is the last one out, it will wakeup the
-        // change thread
-        this->waiting_to_change_state_.signal ();
+	// This thread did not get a chance to become the change
+	// thread. If it is the last one out, it will wakeup the
+	// change thread
+	this->waiting_to_change_state_.signal ();
     }
   // This is if we were woken up explicitily by the user and there are
   // no state changes required.
@@ -1883,7 +1882,7 @@ ACE_WFMO_Reactor_Notify::ACE_WFMO_Reactor_Notify (void)
 
 int
 ACE_WFMO_Reactor_Notify::open (ACE_Reactor_Impl *wfmo_reactor,
-                               ACE_Timer_Queue *timer_queue,
+			       ACE_Timer_Queue *timer_queue,
                                int ignore_notify)
 {
   timer_queue_ = timer_queue;
@@ -1900,8 +1899,8 @@ ACE_WFMO_Reactor_Notify::get_handle (void) const
 
 int
 ACE_WFMO_Reactor_Notify::handle_signal (int signum,
-                                        siginfo_t *siginfo,
-                                        ucontext_t *)
+					siginfo_t *siginfo,
+					ucontext_t *)
 {
   ACE_UNUSED_ARG (signum);
 
@@ -1919,65 +1918,65 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
       ACE_Message_Block *mb = 0;
 
       if (this->message_queue_.dequeue_head
-          (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        {
-          if (errno == EWOULDBLOCK)
-            // We've reached the end of the processing, return
-            // normally.
-            return 0;
-          else
-            return -1; // Something weird happened...
-        }
+	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+	{
+	  if (errno == EWOULDBLOCK)
+	    // We've reached the end of the processing, return
+	    // normally.
+	    return 0;
+	  else
+	    return -1; // Something weird happened...
+	}
       else
-        {
-          ACE_Notification_Buffer *buffer =
-            (ACE_Notification_Buffer *) mb->base ();
-
-          // If eh == 0 then we've got major problems!  Otherwise, we
-          // need to dispatch the appropriate handle_* method on the
-          // ACE_Event_Handler pointer we've been passed.
-
-          if (buffer->eh_ != 0)
-            {
-              int result = 0;
-
-              switch (buffer->mask_)
-                {
-                case ACE_Event_Handler::READ_MASK:
-                case ACE_Event_Handler::ACCEPT_MASK:
-                  result = buffer->eh_->handle_input (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::WRITE_MASK:
-                  result = buffer->eh_->handle_output (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::EXCEPT_MASK:
-                  result = buffer->eh_->handle_exception (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::QOS_MASK:
-                  result = buffer->eh_->handle_qos (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::GROUP_QOS_MASK:
-                  result = buffer->eh_->handle_group_qos (ACE_INVALID_HANDLE);
-                  break;
-                default:
-                  ACE_ERROR ((LM_ERROR,
+	{
+	  ACE_Notification_Buffer *buffer =
+	    (ACE_Notification_Buffer *) mb->base ();
+
+	  // If eh == 0 then we've got major problems!  Otherwise, we
+	  // need to dispatch the appropriate handle_* method on the
+	  // ACE_Event_Handler pointer we've been passed.
+
+	  if (buffer->eh_ != 0)
+	    {
+	      int result = 0;
+
+	      switch (buffer->mask_)
+		{
+		case ACE_Event_Handler::READ_MASK:
+		case ACE_Event_Handler::ACCEPT_MASK:
+		  result = buffer->eh_->handle_input (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::WRITE_MASK:
+		  result = buffer->eh_->handle_output (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::EXCEPT_MASK:
+		  result = buffer->eh_->handle_exception (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::QOS_MASK:
+		  result = buffer->eh_->handle_qos (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::GROUP_QOS_MASK:
+		  result = buffer->eh_->handle_group_qos (ACE_INVALID_HANDLE);
+		  break;
+		default:
+		  ACE_ERROR ((LM_ERROR,
                               ASYS_TEXT ("invalid mask = %d\n"),
                               buffer->mask_));
-                  break;
-                }
-              if (result == -1)
-                buffer->eh_->handle_close (ACE_INVALID_HANDLE,
-                                           ACE_Event_Handler::EXCEPT_MASK);
-            }
-
-          // Make sure to delete the memory regardless of success or
-          // failure!
-          mb->release ();
-
-          // Bail out if we've reached the <max_notify_iterations_>.
-          // Note that by default <max_notify_iterations_> is -1, so
-          // we'll loop until we're done.
-          if (i == this->max_notify_iterations_)
+		  break;
+		}
+	      if (result == -1)
+		buffer->eh_->handle_close (ACE_INVALID_HANDLE,
+					   ACE_Event_Handler::EXCEPT_MASK);
+	    }
+
+	  // Make sure to delete the memory regardless of success or
+	  // failure!
+	  mb->release ();
+
+	  // Bail out if we've reached the <max_notify_iterations_>.
+	  // Note that by default <max_notify_iterations_> is -1, so
+	  // we'll loop until we're done.
+	  if (i == this->max_notify_iterations_)
             {
               // If there are still notification in the queue, we need
               // to wake up again
@@ -1987,7 +1986,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
               // Break the loop as we have reached max_notify_iterations_
               return 0;
             }
-        }
+	}
     }
 }
 
@@ -1997,8 +1996,8 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
 
 int
 ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
-                                 ACE_Reactor_Mask mask,
-                                 ACE_Time_Value *timeout)
+				 ACE_Reactor_Mask mask,
+				 ACE_Time_Value *timeout)
 {
   if (eh != 0)
     {
@@ -2008,7 +2007,7 @@ ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
                       -1);
 
       ACE_Notification_Buffer *buffer =
-        (ACE_Notification_Buffer *) mb->base ();
+	(ACE_Notification_Buffer *) mb->base ();
       buffer->eh_ = eh;
       buffer->mask_ = mask;
 
@@ -2016,14 +2015,14 @@ ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
       // current time of day.  This is what <ACE_Message_Queue>
       // expects.
       if (timeout != 0)
-        *timeout += timer_queue_->gettimeofday ();
+	*timeout += timer_queue_->gettimeofday ();
 
       if (this->message_queue_.enqueue_tail
-          (mb, timeout) == -1)
-        {
-          mb->release ();
-          return -1;
-        }
+	  (mb, timeout) == -1)
+	{
+	  mb->release ();
+	  return -1;
+	}
     }
 
   return this->wakeup_one_thread_.signal ();
@@ -2082,8 +2081,8 @@ ACE_WFMO_Reactor::max_notify_iterations (void)
 #if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
 int
 WSAEventSelect (SOCKET s,
-                WSAEVENT hEventObject,
-                long lNetworkEvents)
+		WSAEVENT hEventObject,
+		long lNetworkEvents)
 {
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (hEventObject);
@@ -2094,8 +2093,8 @@ WSAEventSelect (SOCKET s,
 
 int
 WSAEnumNetworkEvents (SOCKET s,
-                      WSAEVENT hEventObject,
-                      LPWSANETWORKEVENTS lpNetworkEvents)
+		      WSAEVENT hEventObject,
+		      LPWSANETWORKEVENTS lpNetworkEvents)
 {
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (hEventObject);
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index a9863b094d4..8b046c9730d 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -609,18 +609,6 @@ public:
   // <WaitForMultipleObjects> for the <bAlertable> option.
 
 
-  // = Event handling control.
-
-  virtual int deactivated (void);
-  // Return the status of Reactor.  If this function returns 0, the reactor is
-  // actively handling events.  If it returns non-zero, <handling_events> and
-  // <handle_alertable_events> return -1 immediately.
-
-  virtual void deactivate (int do_stop);
-  // Control whether the Reactor will handle any more incoming events or not.
-  // If <do_stop> == 1, the Reactor will be disabled.  By default, a reactor
-  // is in active state and can be deactivated/reactived as wish.
-
   // = Register and remove Handlers.
 
   virtual int register_handler (ACE_Event_Handler *event_handler,
@@ -1084,10 +1072,6 @@ protected:
   int open_for_business_;
   // This flag is used to keep track of whether we are already closed.
 
-  sig_atomic_t deactivated_;
-  // This flag is used to keep track of whether we are actively handling
-  // events or not.
-
 private:
   ACE_WFMO_Reactor (const ACE_WFMO_Reactor &);
   ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &);
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index 3a4215119be..ec27a225fb6 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -821,19 +821,6 @@ ACE_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long)
 }
 
 ACE_INLINE int
-ACE_WFMO_Reactor::deactivated (void)
-{
-  return this->deactivated_;
-}
-
-ACE_INLINE void
-ACE_WFMO_Reactor::deactivate (int do_stop)
-{
-  this->deactivated_ = do_stop;
-  this->wakeup_all_threads ();
-}
-
-ACE_INLINE int
 ACE_WFMO_Reactor::owner (ACE_thread_t *t)
 {
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc
index 67f5e97e22f..2a084e896ae 100644
--- a/ace/ace-dll.icc
+++ b/ace/ace-dll.icc
@@ -1,28 +1,28 @@
 if $__TOS_WIN__ {
-        option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-                 define ("WIN32","1"),
-                 define ("_WINDOWS","1")
-        TARG = "aced.dll"
+	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
+	         define ("WIN32","1"),
+        	 define ("_WINDOWS","1")
+	TARG = "aced.dll"
 }
 if $__TOS_AIX__ {
-        option PlatformOptions = null
-        TARG = "libACEshr.a"
-        option report(disable, "CPPC1125")
+	option PlatformOptions = null
+	TARG = "aced.shr.a"
 }
 
 option
-         PlatformOptions,
-         define ("__ACE_INLINE__","0"),
+	 PlatformOptions,
+         incl(searchPath,'H:\ACE_wrappers'),
+       	 define ("__ACE_INLINE__","0"),
          define("ACE_HAS_DLL","0"),
          link(exportAll),
          link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes),
-         incl(searchpath, "..")
+         link(linkWithMultiThreadLib,yes)
          {
                target type (dll) TARG
                 {
                        option macros(global)
                         {
+                             source type(cpp) "ACE.h"
                              source type(cpp) "OS.h"
                         }
                  source type(cpp) "Log_Msg.cpp"
@@ -188,12 +188,17 @@ option
                  source type(cpp) "WIN32_Proactor.cpp"
                  source type(cpp) "XtReactor.cpp"
                  source type(cpp) "Active_Map_Manager_T.cpp"
+                 source type(cpp) "Cache_Hash_T.cpp"
+                 source type(cpp) "Cache_Heap_T.cpp"
+                 source type(cpp) "Cache_Manager_T.cpp"
                  source type(cpp) "Containers_T.cpp"
                  source type(cpp) "Dump_T.cpp"
                  source type(cpp) "Env_Value_T.cpp"
                  source type(cpp) "Event_Handler_T.cpp"
                  source type(cpp) "Functor_T.cpp"
+                 source type(cpp) "Hash_Bucket_T.cpp"
                  source type(cpp) "Hash_Map_Manager_T.cpp"
+                 source type(cpp) "Hash_Purgable_Map_Manager_T.cpp"
                  source type(cpp) "IOStream_T.cpp"
                  source type(cpp) "Local_Name_Space_T.cpp"
                  source type(cpp) "Malloc_T.cpp"
@@ -227,6 +232,7 @@ option
                  source type (cpp) "Functor_T.cpp"
                  source type (cpp) "Future.cpp"
                  source type (cpp) "Hash_Map_Manager_T.cpp"
+                 source type (cpp) "Hash_Purgable_Map_Manager_T.cpp"
                  source type (cpp) "IOStream_T.cpp"
                  source type (cpp) "LOCK_SOCK_Acceptor.cpp"
                  source type (cpp) "Local_Name_Space_T.cpp"
@@ -256,19 +262,19 @@ option
                  source type (cpp) "Typed_SV_Message.cpp"
                  source type (cpp) "Typed_SV_Message_Queue.cpp"
 
-                  // Libraries needed during linking
-                if $__TOS_WIN__ {
-                        source type (lib) "advapi32.lib"
-                        source type (lib) "user32.lib"
-                        source type (lib) "ws2_32.lib"
-                        source type (lib) "wsock32.lib"
-                        source type (lib) "mswsock.lib"
-                }
-                if $__TOS_AIX__ {
+		  // Libraries needed during linking
+		if $__TOS_WIN__ {
+			source type (lib) "advapi32.lib"
+                 	source type (lib) "user32.lib"
+		  	source type (lib) "ws2_32.lib"
+		  	source type (lib) "wsock32.lib"
+		  	source type (lib) "mswsock.lib"
+		}
+		if $__TOS_AIX__ {
                         source type (lib) "libtli_r.a"
                         source type (lib) "libpthreads.a"
                         source type (lib) "libc_r.a"
                         source type (lib) "libdl.a"
-                }
+		}
         }
 }
diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc
index 6911c45e6c1..4552416ede5 100644
--- a/ace/ace-lib.icc
+++ b/ace/ace-lib.icc
@@ -6,12 +6,12 @@ if $__TOS_WIN__ {
 }
 if $__TOS_AIX__ {
 	option PlatformOptions = null
-	TARG = "libACE.a"
+	TARG = "aced.a"
 }
 
 option
 	 PlatformOptions,
-         incl(searchPath,'..'),
+         incl(searchPath,'H:\ACE_wrappers'),
        	 define ("__ACE_INLINE__","0"),
          define("ACE_HAS_DLL","0"),
          link(exportAll),
@@ -22,6 +22,7 @@ option
                 {
                        option macros(global)
                         {
+                             source type(cpp) "ACE.h"
                              source type(cpp) "OS.h"
                         }
                  source type(cpp) "Log_Msg.cpp"
@@ -187,12 +188,17 @@ option
                  source type(cpp) "WIN32_Proactor.cpp"
                  source type(cpp) "XtReactor.cpp"
                  source type(cpp) "Active_Map_Manager_T.cpp"
+                 source type(cpp) "Cache_Hash_T.cpp"
+                 source type(cpp) "Cache_Heap_T.cpp"
+                 source type(cpp) "Cache_Manager_T.cpp"
                  source type(cpp) "Containers_T.cpp"
                  source type(cpp) "Dump_T.cpp"
                  source type(cpp) "Env_Value_T.cpp"
                  source type(cpp) "Event_Handler_T.cpp"
                  source type(cpp) "Functor_T.cpp"
+                 source type(cpp) "Hash_Bucket_T.cpp"
                  source type(cpp) "Hash_Map_Manager_T.cpp"
+                 source type(cpp) "Hash_Purgable_Map_Manager_T.cpp"
                  source type(cpp) "IOStream_T.cpp"
                  source type(cpp) "Local_Name_Space_T.cpp"
                  source type(cpp) "Malloc_T.cpp"
@@ -226,6 +232,7 @@ option
                  source type (cpp) "Functor_T.cpp"
                  source type (cpp) "Future.cpp"
                  source type (cpp) "Hash_Map_Manager_T.cpp"
+                 source type (cpp) "ace/Hash_Purgable_Map_Manager_T.cpp"
                  source type (cpp) "IOStream_T.cpp"
                  source type (cpp) "LOCK_SOCK_Acceptor.cpp"
                  source type (cpp) "Local_Name_Space_T.cpp"
diff --git a/ace/ace.rc b/ace/ace.rc
deleted file mode 100644
index ede20b12cdf..00000000000
--- a/ace/ace.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "Version.h"
-
-1 VERSIONINFO
- FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ACE\0"
-            VALUE "FileVersion", ACE_VERSION "\0"
-            VALUE "InternalName", "ACEDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ACE.DLL\0"
-            VALUE "ProductName", "ACE\0"
-            VALUE "ProductVersion", ACE_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 38fa47e09a5..9738415c47a 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -5,19 +5,19 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=ACE DLL - Win32 MFC Debug

+CFG=ACE DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "ace_dll.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 MFC Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")

@@ -26,12 +26,9 @@ CFG=ACE DLL - Win32 MFC Debug
 !MESSAGE "ACE DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

@@ -63,7 +60,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

+# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

@@ -94,7 +91,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:I386 /out:"..\bin\ace.dll"

+# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

@@ -125,7 +122,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceud.pdb" /debug /machine:I386 /out:"..\bin\aceud.dll" /pdbtype:sept

+# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:I386 /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

@@ -156,7 +153,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /machine:I386 /out:"..\bin\aceu.dll"

+# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:I386 /out:"..\bin\aceu.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

@@ -173,12 +170,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -188,7 +185,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

@@ -205,12 +202,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -220,7 +217,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

@@ -237,12 +234,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -252,7 +249,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceud.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

@@ -269,80 +266,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo /o".\ace.bsc"

-# ADD BSC32 /nologo /o".\ace.bsc"

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ACE_DLL___Win32_MFC_Debug"

-# PROP BASE Intermediate_Dir "ACE_DLL___Win32_MFC_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT BASE CPP /YX /Yc /Yu

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo /o".\ace.bsc"

-# ADD BSC32 /nologo /o".\ace.bsc"

-LINK32=link.exe

-# ADD BASE LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\acemfcd.pdb" /debug /machine:I386 /out:"..\bin\acemfcd.dll" /pdbtype:sept

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ACE_DLL___Win32_MFC_Release"

-# PROP BASE Intermediate_Dir "ACE_DLL___Win32_MFC_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

+# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -350,12 +279,12 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

-# ADD BASE LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\acemfc.pdb" /machine:I386 /out:"..\bin\acemfc.dll"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

 # SUBTRACT LINK32 /pdb:none

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -367,4384 +296,656 @@ LINK32=link.exe
 # Name "ACE DLL - Win32 Alpha Release"

 # Name "ACE DLL - Win32 Alpha Unicode Debug"

 # Name "ACE DLL - Win32 Alpha Unicode Release"

-# Name "ACE DLL - Win32 MFC Debug"

-# Name "ACE DLL - Win32 MFC Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\ACE.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Activation_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Arg_Shifter.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\ARGV.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO_Impl.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

-SOURCE=.\Based_Pointer_Repository.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

+SOURCE=.\Basic_Types.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Basic_Types.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

+SOURCE=.\Based_Pointer_Repository.cpp

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Handler.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Ref.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Date_Time.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dirent.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Filecache.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Get_Opt.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Set.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\High_Res_Timer.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\INET_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_Cntl_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_SAP.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IPC_SAP.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Tokens.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Record.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_CODgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Dgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Mem_Map.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Memory_Pool.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Method_Request.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Msg_WFMO_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Multiplexor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Proxy.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Request_Reply.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Context.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Service.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Obstack.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parse_Node.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pipe.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Proactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile_Timer.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Read_Buffer.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry_Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Tokens.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched_Params.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_Base.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Config.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Object.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Repository.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Types.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_MM.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_SV.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Object.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Signal.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_CODgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Bcast.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Mcast.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SString.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stats.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Complex.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Simple.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_l.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_y.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Handler.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Options.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\System_Time.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Template_Instantiations.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Request_Reply.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timeprobe.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Adapters.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Collection.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Invariants.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Request_Reply.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TP_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trace.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TTY_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UNIX_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\WFMO_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Asynch_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Proactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\XtReactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -4800,7 +1001,7 @@ SOURCE=.\Auto_Ptr.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Base_Pointer_T.h

+SOURCE=.\Basic_Types.h

 # End Source File

 # Begin Source File

 

@@ -4808,7 +1009,7 @@ SOURCE=.\Based_Pointer_Repository.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Basic_Types.h

+SOURCE=.\Base_Pointer_T.h

 # End Source File

 # Begin Source File

 

@@ -6293,2060 +2494,212 @@ SOURCE=.\WIN32_Proactor.i
 # Begin Source File

 

 SOURCE=.\Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Auto_Ptr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Base_Pointer_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cache_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cached_Connect_Strategy_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Caching_Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Caching_Utility_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cleanup_Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Free_List.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Future.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Cache_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_With_Allocator_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Managed_Object.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Module.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\RB_Tree.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Singleton.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream_Modules.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # End Group

 # Begin Group "Documentation"

diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 1ebd21479b8..0f74d39a0c1 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -1,11 +1,4 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_AIX_MAJOR_VERS)
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 1
-#endif
-
 #include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index 25672351a0c..0f74d39a0c1 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -1,11 +1,4 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_AIX_MAJOR_VERS)
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 2
-#endif
-
 #include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.3.x.h b/ace/config-aix-4.3.x.h
deleted file mode 100644
index dae15950e06..00000000000
--- a/ace/config-aix-4.3.x.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (ACE_AIX_MAJOR_VERS)
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 3
-#endif
-
-#include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 2b65f4ac411..2ba01f9526f 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -9,7 +9,7 @@
 #define ACE_CONFIG_H
 
 #if defined (__xlC__) || (__IBMCPP__)
-   // AIX xlC, IBM C/C++, and Visual Age C++ compilers
+   // AIX xlC compiler
    //********************************************************************
    //
    // Compiler-related definitions.  These are set for C Set ++ V3
@@ -19,21 +19,18 @@
 
    // Keep an eye on this as the compiler and standards converge...
 #  define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#  define ACE_LACKS_PRAGMA_ONCE
+#if defined (__IBMCPP__)
+   #define ACE_TEMPLATES_REQUIRE_SOURCE
+#endif /* __IBMCPP__ */
+
+#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
+#undef WIFEXITED
+#undef WEXITSTATUS
+#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
 
-   // C Set++ 3.1 and IBM C/C++ 3.6
-#  if defined (__xlC__)
-#    define ACE_TEMPLATES_REQUIRE_PRAGMA
-#  endif
+#  define ACE_TEMPLATES_REQUIRE_PRAGMA
 
-   // These are for Visual Age C++ only
-#  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#    define ACE_TEMPLATES_REQUIRE_SOURCE
-#    define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-#    define ACE_HAS_TYPENAME_KEYWORD
-#    undef WIFEXITED
-#    undef WEXITSTATUS
-#  endif /* __IBMCPP__ */
+#  define ACE_LACKS_PRAGMA_ONCE
 
 #elif defined (__GNUG__)
 # include "ace/config-g++-common.h"
@@ -214,7 +211,6 @@
 // send email to ace-users@cs.wustl.edu reporting this.
 // #define ACE_LACKS_CONDATTR_PSHARED
 // #define ACE_LACKS_MUTEXATTR_PSHARED
-#  define ACE_LACKS_SETSCHED
 #endif /* ACE_AIX_MINOR_VERS >= 3 */
 
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
diff --git a/ace/config-cray.h b/ace/config-cray.h
index e9ab5630593..5ad6d571449 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -5,12 +5,12 @@
 #define ACE_CONFIG_CRAY_H
 
 /*
-    The following predefined macros are used within ACE ifdefs.
+    The following predefined macros are used within ACE ifdefs.  
     These are defined when using the Cray compilers.  _CRAYMPP
     is defined, for example, if you are running on a Cray T3E
     massively parallel machine.  Moreover, in the case of the T3E,
     _CRAYT3E will be defined.  This is used to determine the
-    ACE_SIZEOF defines for primitive types.
+    ACE_SIZEOF defines for primitive types.  
 
     _UNICOS is defined as either the major version of UNICOS being run,
     e.g. 9 or 10 on the vector machines (e.g. C90, T90, J90, YMP, ...)
@@ -23,10 +23,10 @@
     _CRAYT3E  (defined specifically if compiling on a Cray T3E)
     _UNICOS   (defined if running UNICOS or UNICOS/mk)
 
-    Tested on UNICOS 10.0.0.5, UNICOS/mk 2.0.4.57
+    Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10
     Compiles on UNICOS 9.0.2.8, but some tests deadlock
 
-    Contributed by Doug Anderson <dla@home.com>
+    Contributed by Doug Anderson <doug@clark.net>
 */
 
 #if defined (_UNICOS) && !defined (MAXPATHLEN)
@@ -46,7 +46,7 @@
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
 // using cray's autoinstantiation gives C++ prelinker: error: instantiation loop
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
@@ -69,7 +69,7 @@
 // UNICOS versions sport Draft 7 threads.
 
 #if _UNICOS > 9
-# define ACE_HAS_PTHREADS_STD
+# define ACE_HAS_PTHREADS_STD  
 #else
 # define ACE_HAS_PTHREADS_DRAFT7
 # define ACE_LACKS_THREAD_STACK_SIZE
@@ -78,6 +78,7 @@
 # define SCHED_OTHER 0
 # define SCHED_FIFO 1
 # define SCHED_RR 2
+# define pthread_sigmask sigprocmask
 #endif
 
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
@@ -117,9 +118,7 @@
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
-#if _UNICOS > 9
-# define ACE_HAS_SIGWAIT
-#endif
+#define ACE_HAS_SIGWAIT
 
 #define ACE_HAS_SIG_ATOMIC_T
 
@@ -207,27 +206,27 @@
 
 #ifndef _CRAYMPP
 
-# define ACE_SIZEOF_CHAR        1
-# define ACE_SIZEOF_SHORT       8
-# define ACE_SIZEOF_INT         8
-# define ACE_SIZEOF_LONG        8
-# define ACE_SIZEOF_LONG_LONG   8
-# define ACE_SIZEOF_FLOAT       8
-# define ACE_SIZEOF_DOUBLE      8
-# define ACE_SIZEOF_LONG_DOUBLE 16
-# define ACE_SIZEOF_VOID_P      8
+# define ACE_SIZEOF_CHAR	1
+# define ACE_SIZEOF_SHORT	8
+# define ACE_SIZEOF_INT		8
+# define ACE_SIZEOF_LONG	8
+# define ACE_SIZEOF_LONG_LONG	8
+# define ACE_SIZEOF_FLOAT	8
+# define ACE_SIZEOF_DOUBLE	8
+# define ACE_SIZEOF_LONG_DOUBLE	16
+# define ACE_SIZEOF_VOID_P	8
 
 #elif defined(_CRAYT3E)
 
-# define ACE_SIZEOF_CHAR        1
-# define ACE_SIZEOF_SHORT       4
-# define ACE_SIZEOF_INT         8
-# define ACE_SIZEOF_LONG        8
-# define ACE_SIZEOF_LONG_LONG   8
-# define ACE_SIZEOF_FLOAT       4
-# define ACE_SIZEOF_DOUBLE      8
-# define ACE_SIZEOF_LONG_DOUBLE 8
-# define ACE_SIZEOF_VOID_P      8
+# define ACE_SIZEOF_CHAR	1
+# define ACE_SIZEOF_SHORT	4
+# define ACE_SIZEOF_INT		8
+# define ACE_SIZEOF_LONG	8
+# define ACE_SIZEOF_LONG_LONG	8
+# define ACE_SIZEOF_FLOAT	4
+# define ACE_SIZEOF_DOUBLE	8
+# define ACE_SIZEOF_LONG_DOUBLE	8
+# define ACE_SIZEOF_VOID_P	8
 
 #endif
 
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 7464876215c..78f3c24c554 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -8,8 +8,7 @@
 #ifndef ACE_GNUG_COMMON_H
 #define ACE_GNUG_COMMON_H
 
-#if __GNUC__ > 2  ||  ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)  || \
-    (defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x540)
+#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
   // egcs or g++ >= 2.8.0
 
 # define ACE_HAS_ANSI_CASTS
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
index 16729ff28a8..9e49f971191 100644
--- a/ace/config-ghs-common.h
+++ b/ace/config-ghs-common.h
@@ -20,11 +20,9 @@
 #   define ACE_LACKS_AUTO_PTR
 #   define ACE_LACKS_CHAR_RIGHT_SHIFTS
 #   define ACE_LACKS_UNBUFFERED_STREAMBUF
-#   define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-# else
-#   define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 # endif /* __STANDARD_CXX */
 
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 # define ACE_HAS_WCHAR_TYPEDEFS_CHAR
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 # define ACE_LACKS_LONGLONG_T
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 0a7c2de101a..c399a403fa1 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -46,14 +46,6 @@
 #  define volatile
 
 #else  // aC++ definitions
- 
-// Parts of TAO (at least) use __HP_aCC to detect this compiler, but the
-// macro is not set until A.01.18. If it's not set, set it - it won't be an
-// HP-advertised value, but we don't check the value/version - just whether
-// it's set or not.
-#  if !defined (__HP_aCC)
-#    define __HP_aCC
-#  endif /* __HP_aCC */
 
 // Compiler supports to-be-ANSI casts
 #  define ACE_HAS_ANSI_CASTS
diff --git a/ace/config-hpux-11.x-hpc++.h b/ace/config-hpux-11.x-hpc++.h
index 84dc1d8f5f1..1913e68c707 100644
--- a/ace/config-hpux-11.x-hpc++.h
+++ b/ace/config-hpux-11.x-hpc++.h
@@ -37,14 +37,6 @@
 #  define volatile
 
 #else  // aC++ definitions
- 
-// Parts of TAO (at least) use __HP_aCC to detect this compiler, but the
-// macro is not set until A.03.13. If it's not set, set it - it won't be an
-// HP-advertised value, but we don't check the value/version - just whether
-// it's set or not.
-#  if !defined (__HP_aCC)
-#    define __HP_aCC
-#  endif /* __HP_aCC */
 
 // Compiler supports ANSI casts
 #  define ACE_HAS_ANSI_CASTS
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index 6990d608a9d..dbc6e41c9df 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -67,7 +67,6 @@
 #if _COMPILER_VERSION >= 720
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_HAS_USING_KEYWORD
 #else
 #define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #endif /* _COMPILER_VERSION >= 720 */
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index ed84e0efa40..0f864be27f5 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -60,7 +60,6 @@
 #define ACE_LACKS_UNBUFFERED_STREAMBUF 1
 #define ACE_HAS_EXCEPTIONS 1
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_NEW_THROWS_EXCEPTIONS
 
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 25caddcf43c..c988bf8c3ca 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -31,6 +31,8 @@
 # define ACE_HAS_ALLOCA_H
 # define ACE_HAS_PENTIUM
 #elif defined (__powerpc__)
+  // fork ()/exec () don't seem to work well on PPC.
+# define ACE_LACKS_FORK
   // It looks like the default stack size is 15000.
   // ACE's Recursive_Mutex_Test needs more.
 # define ACE_NEEDS_HUGE_THREAD_STACKSIZE 32000
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index d87bba5b8c0..4eb1f8bdd33 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -21,6 +21,10 @@
 
 #define ACE_MVS
 
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+#define ACE_HAS_NONCONST_SELECT_TIMEVAL
+
 // See the README file in this directory
 // for a description of the following ACE_ macros
 
@@ -30,22 +34,22 @@
 #else
 # define ACE_LACKS_UCONTEXT_H
 #endif /* __COMPILER_VER__ >= 0x21020000 */
-
 #define ACE_HAS_BROKEN_CTIME
+#define ACE_HAS_UALARM
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_DIRENT
-#define ACE_HAS_EXCEPTIONS
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_GETRUSAGE
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_LIMITED_RUSAGE_T
 #define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_NONSCALAR_THREAD_KEY_T
 #define ACE_HAS_POLL
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_POSIX_TIME
+
+// Platform defines struct timespec but not timespec_t
+#define ACE_LACKS_TIMESPEC_T
+
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_DRAFT6
 #define ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP
@@ -60,18 +64,15 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_THR_C_DEST
 #define ACE_HAS_THR_C_FUNC
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_HAS_UALARM
 #define ACE_HAS_UTIME
 #define ACE_HAS_VOIDPTR_MMAP
 #define ACE_HAS_VOIDPTR_SOCKOPT
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_IOSTREAM_FX
@@ -82,23 +83,21 @@
 #define ACE_LACKS_MSGBUF_T
 #define ACE_LACKS_PARAM_H
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_READDIR_R
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SETSCHED
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYS_NERR
 #define ACE_LACKS_TCP_H
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_THREAD_STACK_ADDR
-#define ACE_LACKS_TIMESPEC_T
-
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 #endif
-
 #define ACE_NEEDS_DEV_IO_CONVERSION
+#define ACE_LACKS_SYSTIME_H
+#define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
@@ -107,7 +106,7 @@
 #define ACE_SIZEOF_FLOAT 4
 #define ACE_SIZEOF_DOUBLE 8
 #define ACE_SIZEOF_LONG_DOUBLE 16
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_HAS_DIRENT
+#define ACE_LACKS_READDIR_R
 
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 8321aedbb6e..32a1ed81b1a 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -1,17 +1,14 @@
 /* -*- C++ -*- */
 // $Id$
 
-// NOTE:  if you are using Digital UNIX V4.0f or later, you must
-// use config-tru64.h instead of directly using this config file.
-
 // The following configuration file is designed to work for the
-// Digital UNIX V4.0a through V4.0d with either the GNU g++, DEC
+// Digital UNIX V4.0a and later platforms with either the GNU g++, DEC
 // cxx 5.4 and later, Rational RCC (2.4.1) compilers, or KAI 3.3
 // compilers.  It is configured to use the IEEE Std 1003.1c-1995,
 // POSIX System Application Program Interface, or DCE threads (with
 // cxx only); it automatically selects the proper thread interface
 // depending on whether the cxx -pthread or -threads option was
-// specified.  By 4.0a, the version is meant that is called "V4.0 464"
+// specified.  By 4.0a the version is meant that is called "V4.0 464"
 // by uname -a.
 
 #ifndef ACE_CONFIG_H
@@ -83,10 +80,10 @@
 #     pragma message disable intconlosbit
 #   endif /* __DECCXX_VER >= 60190029 */
 
-#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX >= 0x40F
+#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX == 5
       // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
 #     pragma message disable declbutnotref
-#   endif /* DIGITAL_UNIX >= 4.0f */
+#   endif /* DIGITAL_UNIX 5 */
 
 #   if defined (ACE_HAS_EXCEPTIONS)
 #     pragma message disable unrfunprm
@@ -122,7 +119,7 @@
 # define ACE_LACKS_T_ERRNO
 # define ACE_POLL_IS_BROKEN
 # if !defined (DIGITAL_UNIX)
-#   define DIGITAL_UNIX 0x400
+#   define DIGITAL_UNIX
 # endif /* ! DIGITAL_UNIX */
   // DJT removed this due to some minor issues related to the
   // definitions of timestruc_t and tid_t in procfs.h not sure what
diff --git a/ace/config-osf1.h b/ace/config-osf1.h
new file mode 100644
index 00000000000..1e6541392c7
--- /dev/null
+++ b/ace/config-osf1.h
@@ -0,0 +1,21 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for the
+// Digital UNIX V4.0a and later platforms.  It relies on
+// config-osf1-4.0.h, and adds deltas for newer platforms.
+
+#ifndef ACE_CONFIG_OSF1_H
+#define ACE_CONFIG_OSF1_H
+
+#if defined (DIGITAL_UNIX)
+#  include "ace/config-osf1-4.0.h"
+#  if DIGITAL_UNIX >= 5
+#    define _LIBC_POLLUTION_H_
+#    define ACE_LACKS_SYSTIME_H
+#  endif /* DIGITAL_UNIX >= 5 */
+#else  /* ! DIGITAL_UNIX */
+#  include "ace/config-osf1-3.2.h"
+#endif /* ! DIGITAL_UNIX */
+
+#endif /* ACE_CONFIG_OSF1_H */
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index 6d2850959d9..cea218e345b 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -6,14 +6,6 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-#define _POSIX_C_SOURCE 199506
-#define _QNX_SOURCE
-
-// These constants are in i386-nto/include/limits.h, but egcs
-// picks up its own limits.h instead:
-#define _POSIX_NAME_MAX     14      /*  Max bytes in a filename             */
-#define _POSIX_PATH_MAX     256     /*  Num. bytes in pathname (excl. NULL) */
-
 // gcc can do inline
 #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
 # if !defined (__ACE_INLINE__)
@@ -37,8 +29,8 @@
 //  ace expects 128 & 1024 respectively
 //  to set the following macros in ace/Basic_Types.h
 //  These macros are:
-// #define ACE_SIZEOF_DOUBLE   8
-// #define ACE_SIZEOF_FLOAT    4
+#define ACE_SIZEOF_DOUBLE   8
+#define ACE_SIZEOF_FLOAT    4
 
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
@@ -51,8 +43,10 @@
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
+#define ACE_HAS_IDTYPE_T
 #define ACE_HAS_INLINED_OSCALLS
 #define ACE_HAS_IP_MULTICAST
+#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
@@ -90,6 +84,7 @@
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MSGBUF_T
+#define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_NAMED_POSIX_SEM
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
@@ -122,7 +117,7 @@
 #define ACE_NEEDS_FUNC_DEFINITIONS
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000
 #define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 4204e74b5bf..96ae7e1dbce 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -13,7 +13,6 @@
 #define MAXPATHLEN 1023
 #endif /* SCO */
 
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_SIG_MACROS
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_LACKS_SYSCALL
@@ -84,7 +83,7 @@
 #define ACE_HAS_SELECT_H
 
 // Platform has prototypes for ACE_TLI.
-#define ACE_HAS_TLI_PROTOTYPES
+//#define ACE_HAS_TLI_PROTOTYPES
 // Platform has the XLI version of ACE_TLI.
 // #define ACE_HAS_XLI
 
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 55bd54ae98c..27c6d14931d 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -307,7 +307,7 @@
 #define ACE_HAS_STL_QUEUE_CONFLICT
 #define ACE_HAS_IDTYPE_T
 
-// #define ACE_HAS_POSITION_INDEPENDENT_MALLOC
+  // #define ACE_HAS_POSITION_INDEPENDENT_MALLOC
 
 #define ACE_HAS_GPERF
 #define ACE_HAS_DIRENT
diff --git a/ace/config-sunos5.6-sunc++-4.x.h b/ace/config-sunos5.6-sunc++-4.x.h
deleted file mode 100644
index 7f63838fb78..00000000000
--- a/ace/config-sunos5.6-sunc++-4.x.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for SunOS 5.6
-// platforms using the SunC++ 4.x compiler.
-
-#if !defined (ACE_CONFIG_H)
-
-// ACE_CONFIG_H is defined by the following #included header.
-
-// At this point, there's no difference between our SunOS 5.5 and 5.6
-// configurations.
-#if defined (__SUNPRO_CC)
-# include "ace/config-sunos5.5-sunc++-4.x.h"
-#elif defined (__GNUG__)
-# include "ace/config-sunos5.5-g++.h"
-#else  /* ! __SUNPRO_CC__ && ! __GNUG__ */
-# error unsupported compiler in ace/config-sunos5.6.h
-#endif /* ! __SUNPRO_CC__ && ! __GNUG__ */
-
-// Additional SunOS 5.6 capabilities . . .
-#define ACE_HAS_AIO_CALLS
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 2806261cd34..1e6541392c7 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -5,19 +5,17 @@
 // Digital UNIX V4.0a and later platforms.  It relies on
 // config-osf1-4.0.h, and adds deltas for newer platforms.
 
-#ifndef ACE_CONFIG_TRU64_H
-#define ACE_CONFIG_TRU64_H
+#ifndef ACE_CONFIG_OSF1_H
+#define ACE_CONFIG_OSF1_H
 
 #if defined (DIGITAL_UNIX)
 #  include "ace/config-osf1-4.0.h"
-#  if DIGITAL_UNIX >= 0x40F
-#    define ACE_LACKS_SYSTIME_H
-#  endif /* DIGITAL_UNIX >= 0x40F */
-#  if DIGITAL_UNIX >= 0x500
+#  if DIGITAL_UNIX >= 5
 #    define _LIBC_POLLUTION_H_
-#  endif /* DIGITAL_UNIX >= 0x500 */
+#    define ACE_LACKS_SYSTIME_H
+#  endif /* DIGITAL_UNIX >= 5 */
 #else  /* ! DIGITAL_UNIX */
 #  include "ace/config-osf1-3.2.h"
 #endif /* ! DIGITAL_UNIX */
 
-#endif /* ACE_CONFIG_TRU64_H */
+#endif /* ACE_CONFIG_OSF1_H */
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 24f0171ceab..1a66ffab953 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -49,14 +49,16 @@
   // Processor type, if necessary.  Green Hills defines "ppc".
 # if defined (ppc)
 #   define ACE_HAS_POWERPC_TIMER
-# elif defined (i386) || defined (__i386__)
+# endif /* ppc */
+
+# if defined (i386) || defined (__i386__)
     // If running an Intel, assume that it's a Pentium so that
     // ACE_OS::gethrtime () can use the RDTSC instruction.  If
     // running a 486 or lower, be sure to comment this out.
     // (If not running an Intel CPU, this #define will not be seen
     //  because of the i386 protection, so it can be ignored.)
 #   define ACE_HAS_PENTIUM
-# endif /* ppc || i386 */
+# endif /* i386 */
 
 # define ACE_CONFIG_INCLUDE_GHS_COMMON
 # include "ace/config-ghs-common.h"
@@ -71,7 +73,6 @@
 
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
 #define ACE_DEFAULT_THREAD_KEYS 16
-#define ACE_HAS_BROKEN_ACCEPT_ADDR
 #define ACE_HAS_BROKEN_SENDMSG
 #define ACE_HAS_BROKEN_WRITEV
 #define ACE_HAS_CHARPTR_SOCKOPT
@@ -90,7 +91,6 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_STRDUP_EMULATION
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_TSS_EMULATION
@@ -108,7 +108,6 @@
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
 #define ACE_LACKS_MEMORY_H
-#define ACE_LACKS_MKFIFO
 #define ACE_LACKS_MKTEMP
 #define ACE_LACKS_MMAP
 #define ACE_LACKS_MPROTECT
@@ -129,7 +128,6 @@
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYSV_MSG_H
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_SYS_NERR
@@ -139,22 +137,22 @@
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_UNIX_SIGNALS
 #define ACE_LACKS_UTSNAME_T
-#define ACE_PAGE_SIZE 4096
-#define ACE_THR_PRI_FIFO_DEF 101
-#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
-
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 #endif
-
-#if !defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE)
-# define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000
-#endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */
+#define ACE_LACKS_SYSTIME_H
+#define ACE_PAGE_SIZE 4096
+#define ACE_THR_PRI_FIFO_DEF 101
+#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#define ACE_HAS_STRDUP_EMULATION
+#define ACE_LACKS_MKFIFO
+#define ACE_HAS_BROKEN_ACCEPT_ADDR
+
 // By default, don't include RCS Id strings in object code.
 #if !defined (ACE_USE_RCSID)
 #define ACE_USE_RCSID 0
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index da4f60494a2..e4ab0c8daea 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -97,16 +97,6 @@
 #     endif /* defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) */
 #     define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
-#     if defined (ACE_NEW_THROWS_EXCEPTIONS)
-#       undef ACE_NEW_THROWS_EXCEPTIONS
-#     endif /* defined (ACE_NEW_THROWS_EXCEPTIONS) */
-#     define ACE_NEW_THROWS_EXCEPTIONS 1
-
-#     if defined (ACE_HAS_ANSI_CASTS)
-#       undef ACE_HAS_ANSI_CASTS
-#     endif /* defined (ACE_HAS_ANSI_CASTS) */
-#     define ACE_HAS_ANSI_CASTS 1
-
 #   endif /* (__BORLANDC__ >= 0x0530) */
 
 /*
@@ -158,12 +148,6 @@
 #       undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #     endif /* defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) */
 
-      /* include only forward declaration of iostreams */
-#     if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-#       undef ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-#     endif /* defined (ACE_HAS_STDCPP_STL_INCLUDES) */
-#     define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1
-
       /* need to ensure these are included before <iomanip> */
 #     include <time.h>
 #     include <stdlib.h>
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 60c42bdca11..907f7ec5b44 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -55,17 +55,13 @@ typedef unsigned __int64 ACE_UINT64;
 # define ACE_LACKS_PRAGMA_ONCE
 #endif /* _MSC_VER < 1000 */
 
-// Only >= MSVC 5.0 definitions
+// Only MSVC 5.0 definitions
 #if (_MSC_VER >= 1100)
   #if !defined (ACE_HAS_WINCE)
     #define ACE_HAS_SIG_ATOMIC_T
   #endif /* ACE_HAS_WINCE */
-#endif /* _MSC_VER >= 1100 */
-
-// Only >= MSVC 6.0 definitions
-#if (_MSC_VER >= 1200)
 #define ACE_HAS_TYPENAME_KEYWORD
-#endif /* _MSC_VER >= 1200 */
+#endif /* _MSC_VER >= 1100 */
 
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
@@ -89,6 +85,9 @@ typedef unsigned __int64 ACE_UINT64;
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
 // Platform contains <poll.h>.
 //define ACE_HAS_POLL
 
@@ -274,7 +273,7 @@ typedef unsigned __int64 ACE_UINT64;
 #endif /* NOMINMAX */
 
 #if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE)
-#define UNICODE
+#defined UNICODE
 #endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */
 
 #if defined (_UNICODE)
@@ -411,11 +410,6 @@ typedef unsigned __int64 ACE_UINT64;
         #define ACE_WSOCK_VERSION 1, 1
 #endif /* ACE_HAS_WINSOCK2 */
 
-// Platform supports IP multicast on Winsock 2
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-# define ACE_HAS_IP_MULTICAST
-#endif /* ACE_HAS_WINSOCK2 */
-
 #if defined (_MSC_VER)
         #pragma warning(default: 4201)  /* winnt.h uses nameless structs */
 #endif /* _MSC_VER */
diff --git a/ace/config-win32.h b/ace/config-win32.h
index ac50b3fb85f..955d42a2061 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -166,28 +166,16 @@
 
 // By default, we use non-static object manager on Win32.  That is,
 // the object manager is allocated in main's stack memory.  If this
-// does not suit your need, i.e., if your programs depend on the use
-// of static object manager, you neet to disable the behavior by
-// defining ACE_HAS_NONSTATIC_OBJECT_MANAGER=0.
+// does not suit your need, you can disable the behavior by defining
+// ACE_HAS_NONSTATIC_OBJECT_MANAGER to 0.
 //
-// MFC users: the main function is defined within a MFC library and
-// therefore, ACE won't be able to meddle with main function and
-// instantiate the non-static object manager for you.  To solve the
-// problem, you'll need to instantiate the ACE_Object_Manager by
-// either:
+// MFC users: Since the main function is defined withing MFC library,
+// you'll need to instantiate the ACE_Object_Manager by doing either,
 //
-// 1. Using static object manager (as described above), however, using
-// the non-static object manager is prefered, therefore,
-// 2. Instantiate the non-static object manager yourself by either 1)
-//    call ACE::init () at the beginning and ACE::fini () at the end,
-//    _or_ 2) instantiate the ACE_Object_Manager in your CWinApp
-//    derived class.
+// 1. Using static object manager (as described above.)
+// 2. Instantiate Object Manager in your CApplication derived class
+//    and define ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER.
 //
-// Optionally, you can #define
-// ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER in your
-// ace/config.h and always take care of the business by yourself.
-// ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER has no effect when
-// using static object managers.
 #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
 # define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 #elif (ACE_HAS_NONSTATIC_OBJECT_MANAGER == 0)