ChangeLogTag: Wed Apr 19 07:44:49 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

42 files changed, 61 insertions, 854 deletions

diff --git a/ChangeLog b/ChangeLog
index 43f59efae15..544ca2476c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added Bug_2503_Regression
+
 Tue Apr 18 20:49:16 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * ACE version 5.5.1 released.
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b767734e352..f04aa70e2e7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2503_Regression/*:
+          New regression for bug 2503. Thanks to Carlos O'Ryan for creating
+          this test
+
 Tue Apr 18 20:51:48 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * TAO version 1.5.1 released.
diff --git a/ace/Array_Base.cpp b/ace/Array_Base.cpp
index 66f3ae7ec59..ece933009d6 100644
--- a/ace/Array_Base.cpp
+++ b/ace/Array_Base.cpp
@@ -14,11 +14,6 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Malloc_Base.h"
-
-#if defined (_MSC_VER) && _MSC_VER == 1200 && !defined (ACE_HAS_WINCE)
-#  include <new>  /* For placement new() operator. */
-#endif  /* _MSC_VER == 1200 */
-
 #include "ace/os_include/os_errno.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Array_Map.cpp b/ace/Array_Map.cpp
index e525890d8d4..3db24968a63 100644
--- a/ace/Array_Map.cpp
+++ b/ace/Array_Map.cpp
@@ -81,12 +81,7 @@ ACE_Array_Map<Key, Value, EqualTo>::swap (
 }
 
 template<typename Key, typename Value, class EqualTo>
-#if defined (_MSC_VER) && (_MSC_VER <= 1200)
-// MSVC++ 6 doesn't like the typename qualification.
-std::pair<ACE_Array_Map<Key, Value, EqualTo>::iterator, bool>
-#else
 std::pair<typename ACE_Array_Map<Key, Value, EqualTo>::iterator, bool>
-#endif  /* _MSC_VER <= 1200 */
 ACE_Array_Map<Key, Value, EqualTo>::insert (
   typename ACE_Array_Map<Key, Value, EqualTo>::value_type const & x)
 {
diff --git a/ace/Array_Map.h b/ace/Array_Map.h
index 6ad91b152c8..3425e917d4c 100644
--- a/ace/Array_Map.h
+++ b/ace/Array_Map.h
@@ -102,11 +102,9 @@ public:
   typedef ptrdiff_t                      difference_type;
   typedef size_t                         size_type;
 
-#if ((defined (_MSC_VER) && (_MSC_VER <= 1200)) || \
-     (defined (_MSC_VER) && !defined (_CPPLIB_VER)))
-  // MSVC++ 6 doesn't define a standard's compliant reverse_iterator,
-  // also the latest Platform SDK's don't do this.
-  //
+#if ((defined (_MSC_VER) && !defined (_CPPLIB_VER)))
+  // the latest Platform SDK's doesn't define a standard's compliant
+  // reverse_iterator,
   // It seems when there is no _CPPLIB_VER defined, then we can assume
   // also that the SDK is old.
   typedef std::reverse_iterator<iterator, value_type> reverse_iterator;
@@ -129,7 +127,7 @@ public:
 #else
   typedef std::reverse_iterator<iterator>       reverse_iterator;
   typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-#endif  /* _MSC_VER <= 1200 */
+#endif  /* _MSC_VER */
 
   /// Default Constructor.
   /**
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index e0e4326009f..7dc5f283126 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -319,10 +319,6 @@ public:
                      int signal_number) = 0;
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
-  // We don;t need to redefine the following function again because it
-  // has already been defined in ACE_Asynch_Read_Stream_Impl.  But we
-  // still need it here to supress a overwriting pure virtual function
-  // warning in KAI compiler.
   /// This starts off an asynchronous read. Upto <bytes_to_read> will
   /// be read and stored in the <message_block>.
   virtual int read (ACE_Message_Block &message_block,
@@ -408,13 +404,8 @@ public:
                       int signal_number) = 0;
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
-
-  // We don;t need to redefine the following function again because it
-  // has already been defined in ACE_Asynch_Write_Stream_Impl.  But we
-  // still need it here to supress a overwriting pure virtual function
-  // warning in KAI compiler.
-  /// This starts off an asynchronous write.  Upto <bytes_to_write>
-  /// will be written from the <message_block>.
+  /// This starts off an asynchronous write.  Upto @a bytes_to_write
+  /// will be written from the @a message_block.
   virtual int write (ACE_Message_Block &message_block,
                      size_t bytes_to_write,
                      const void *act,
@@ -472,12 +463,12 @@ public:
   /**
    * This starts off an asynchronous accept.  The asynchronous accept
    * call also allows any initial data to be returned to the
-   * <handler>.  Upto <bytes_to_read> will be read and stored in the
-   * <message_block>.  The <accept_handle> will be used for the
-   * <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
+   * <handler>.  Upto @a bytes_to_read will be read and stored in the
+   * <message_block>.  The @a accept_handle will be used for the
+   * <accept> call.  If (@a accept_handle == INVALID_HANDLE), a new
    * handle will be created.
    *
-   * <message_block> must be specified. This is because the address of
+   * @a message_block must be specified. This is because the address of
    * the new connection is placed at the end of this buffer.
    */
   virtual int accept (ACE_Message_Block &message_block,
diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index 66848a365e3..b4425f32896 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -27,18 +27,8 @@
 #include "os_include/sys/os_time.h"
 #endif // ACE_USES_GPROF
 
-#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \
-     && ACE_HAS_VERSIONED_NAMESPACE == 1) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # define ACE_THREAD_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_thread_adapter)
-
-#else
-
-# define ACE_THREAD_ADAPTER_NAME ace_thread_adapter
-
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
 // Run the thread entry point for the ACE_Thread_Adapter.  This must
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index 04468fa07b1..2719cb3bd21 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -38,12 +38,7 @@
 
 #include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
-
-#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an unsigned char typedef.
-# include "ace/If_Then_Else.h"
-#endif  /* !_MSC_VER || _MSC_VER >= 1310 */
+#include "ace/If_Then_Else.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -173,15 +168,9 @@ public:
    * avoid complaints from all compilers is to define them all.
    */
   //@{
-# if (defined (_MSC_VER) && (_MSC_VER < 1310))
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an unsigned char typedef.
-  typedef unsigned char Boolean;
-# else
   typedef ACE::If_Then_Else<(sizeof (bool) == 1),
                             bool,
                             unsigned char>::result_type Boolean;
-# endif  /* _MSC_VER <= 1310 */
   typedef unsigned char Octet;
   typedef char Char;
   typedef ACE_WCHAR_T WChar;
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index a30ac546b08..2ca41fe93ed 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -9,7 +9,6 @@ ACE_RCSID (ace,
            CDR_Stream,
            "$Id$")
 
-
 // ****************************************************************
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -395,7 +394,7 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_1 (const ACE_CDR::Octet *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (1, buf) == 0)
     {
       *reinterpret_cast<ACE_CDR::Octet*> (buf) = *x;
@@ -408,7 +407,7 @@ ACE_OutputCDR::write_1 (const ACE_CDR::Octet *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -434,7 +433,7 @@ ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -460,7 +459,7 @@ ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
 {
-  char *buf;
+  char *buf = 0;
 
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
     {
@@ -500,7 +499,7 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_16 (const ACE_CDR::LongDouble *x)
 {
-  char* buf;
+  char* buf = 0;
   if (this->adjust (ACE_CDR::LONGDOUBLE_SIZE,
                     ACE_CDR::LONGDOUBLE_ALIGN,
                     buf) == 0)
@@ -531,7 +530,7 @@ ACE_OutputCDR::write_wchar_array_i (const ACE_CDR::WChar *x,
 {
   if (length == 0)
     return true;
-  char* buf;
+  char* buf = 0;
   const size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ?
     ACE_CDR::SHORT_ALIGN :
     ACE_CDR::OCTET_ALIGN;
@@ -573,7 +572,7 @@ ACE_OutputCDR::write_array (const void *x,
 {
   if (length == 0)
     return true;
-  char *buf;
+  char *buf = 0;
   if (this->adjust (size * length, align, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -1053,7 +1052,7 @@ ACE_InputCDR::read_string (ACE_CDR::Char *&x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_string (ACE_CString &x)
 {
-  ACE_CDR::Char *data;
+  ACE_CDR::Char *data = 0;
   if (this->read_string (data))
     {
       x = data;
@@ -1149,7 +1148,7 @@ ACE_InputCDR::read_array (void* x,
 {
   if (length == 0)
     return true;
-  char* buf;
+  char* buf = 0;
 
   if (this->adjust (size * length, align, buf) == 0)
     {
@@ -1193,7 +1192,7 @@ ACE_InputCDR::read_wchar_array_i (ACE_CDR::WChar* x,
 {
   if (length == 0)
     return true;
-  char* buf;
+  char* buf = 0;
   const size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ?
     ACE_CDR::SHORT_ALIGN :
     ACE_CDR::OCTET_ALIGN;
@@ -1288,7 +1287,7 @@ ACE_InputCDR::read_2 (ACE_CDR::UShort *x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_4 (ACE_CDR::ULong *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
@@ -1308,7 +1307,7 @@ ACE_InputCDR::read_4 (ACE_CDR::ULong *x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
 {
-  char *buf;
+  char *buf = 0;
 
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
     {
@@ -1359,7 +1358,7 @@ ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_16 (ACE_CDR::LongDouble *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::LONGDOUBLE_SIZE,
                     ACE_CDR::LONGDOUBLE_ALIGN,
                     buf) == 0)
diff --git a/ace/Cleanup.h b/ace/Cleanup.h
index d288225a0a5..37e46b7e7cb 100644
--- a/ace/Cleanup.h
+++ b/ace/Cleanup.h
@@ -27,20 +27,9 @@
 
 #include "ace/ACE_export.h"
 
-#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \
-     && ACE_HAS_VERSIONED_NAMESPACE == 1) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # include "ace/Global_Macros.h"
-
 # define ACE_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_cleanup_destroyer)
-
-#else
-
-# define ACE_CLEANUP_DESTROYER_NAME ace_cleanup_destroyer
-
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
 
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index c2b56b4fd53..1d22274ebca 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -732,12 +732,7 @@ ACE_Get_Opt::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option (
 
 ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void)
 {
-  // MSVC++ 6 can't deal with deleting a const ACE_TCHAR *.
-#if defined (_MSC_VER) && _MSC_VER < 1300
-  delete [] const_cast <ACE_TCHAR *> (this->name_);
-#else
   delete [] this->name_;
-#endif  /* _MSC_VER < 1300 */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index 9b6579f87de..b09aadfe072 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -128,14 +128,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 // ----------------------------------------------------------------
 
-// Deal with MSVC++ 6 (or less) insanity for CORBA...
-# if !defined (ACE_NESTED_CLASS)
-#   if defined (ACE_HAS_BROKEN_NAMESPACES)
-#     define ACE_NESTED_CLASS(TYPE, NAME) NAME
-#   else  /* ! ACE_HAS_BROKEN_NAMESPACES */
-#     define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
-#   endif /* ! ACE_HAS_BROKEN_NAMESPACES */
-# endif  /* !ACE_NESTED_CLASS */
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  /**
+   * This macro is deprecated
+   */
+  #define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
 
 #if !defined (ACE_LACKS_DEPRECATED_MACROS)
   /**
@@ -149,9 +147,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL
    *             release.
    */
   //@{
-  # define ACE_CORBA_1(NAME) CORBA::NAME
-  # define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
-  # define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
+  #define ACE_CORBA_1(NAME) CORBA::NAME
+  #define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
+  #define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
   //@}
 #endif /* ACE_LACKS_DEPRECATED_MACROS */
 
@@ -631,20 +629,9 @@ static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
  *        implements the service.
  *
  */
-#if defined (_MSC_VER) && _MSC_VER <= 1200
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-/**
- * @todo Remove this macro once we drop MSVC++ 6 support.
- */
-# define ACE_FACTORY_DECLARE(CLS,SERVICE_CLASS) \
-extern "C" CLS##_Export ACE_Service_Object * \
-_make_ ## SERVICE_CLASS (ACE_Service_Object_Exterminator *);
-#else
 # define ACE_FACTORY_DECLARE(CLS,SERVICE_CLASS) \
 extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * \
 ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *);
-#endif  /* _MSC_VER <= 1200*/
 
 /// Define the factory method (and destructor) for a dynamically
 /// loadable service.
@@ -662,27 +649,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
  */
 # define ACE_Local_Service_Export
 
-#if defined (_MSC_VER) && _MSC_VER <= 1200
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-/**
- * @todo Remove this macro once we drop MSVC++ 6 support.
- */
-# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
-void _gobble_ ## SERVICE_CLASS (void *p) { \
-  ACE_Service_Object * _p = \
-    static_cast<ACE_Service_Object *> (p); \
-  ACE_ASSERT (_p != 0); \
-  delete _p; } \
-extern "C" CLS##_Export ACE_Service_Object *\
-_make_ ## SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
-{ \
-  ACE_TRACE (#SERVICE_CLASS); \
-  if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) _gobble_ ## SERVICE_CLASS; \
-  return new SERVICE_CLASS; \
-}
-#else
 # define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
 void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
   ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
@@ -697,7 +663,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
     *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new SERVICE_CLASS; \
 }
-#endif  /* _MSC_VER <= 1200 */
 
 /**
  * For service classes scoped within namespaces, use this macro in
@@ -725,27 +690,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
  * this will ensure unique generated signatures for the various C
  * style functions.
  */
-#if defined (_MSC_VER) && _MSC_VER <= 1200
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-/**
- * @todo Remove this macro once we drop MSVC++ 6 support.
- */
-# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
-void _gobble_ ## SERVICE_CLASS (void *p) { \
-  ACE_Service_Object * _p = \
-    static_cast<ACE_Service_Object *> (p); \
-  ACE_ASSERT (_p != 0); \
-  delete _p; } \
-extern "C" CLS##_Export ACE_Service_Object *\
-_make_ ## SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
-{ \
-  ACE_TRACE (#SERVICE_CLASS); \
-  if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) _gobble_ ## SERVICE_CLASS; \
-  return new NAMESPACE_CLASS; \
-}
-#else
 # define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
 void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
   ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
@@ -760,19 +704,9 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
     *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new NAMESPACE_CLASS; \
 }
-#endif  /* _MSC_VER <= 1200 */
 
 /// The canonical name for a service factory method
-#if defined (_MSC_VER) && _MSC_VER <= 1200
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-/**
- * @todo Remove this macro once we drop MSVC++ 6 support.
- */
-# define ACE_SVC_NAME(SERVICE_CLASS) _make_ ## SERVICE_CLASS
-#else
 # define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)
-#endif  /* ACE_SVC_NAME */
 
 /// The canonical way to invoke (i.e. construct) a service factory
 /// method.
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 0a9b9be3f9f..ef6318cbd8e 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -704,18 +704,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #   define LOCAL_EXTERN_PREFIX
 #  endif /* ACE_HAS_THR_C_DEST */
 
-#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \
-     && ACE_HAS_VERSIONED_NAMESPACE == 1) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # define ACE_TSS_CLEANUP_NAME ACE_PREPROC_CONCATENATE(ACE_,ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _TSS_cleanup))
-
-#else
-
-# define ACE_TSS_CLEANUP_NAME ACE_TSS_cleanup
-
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
 
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 93728f9e355..4b2eec4c657 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -22,7 +22,7 @@ SUBDIRS = \
 
 CLEANFILES =
 lib_LTLIBRARIES =
-nobase_include_HEADERS = 
+nobase_include_HEADERS =
 pkgconfig_DATA =
 
 ## Makefile.ACE.am
@@ -706,7 +706,6 @@ nobase_include_HEADERS += \
   OS_Log_Msg_Attributes.h \
   OS_Log_Msg_Attributes.inl \
   OS_Memory.h \
-  OS_Memory.inl \
   OS_NS_Thread.h \
   OS_NS_Thread.inl \
   OS_NS_arpa_inet.h \
@@ -773,7 +772,6 @@ nobase_include_HEADERS += \
   OS_NS_wchar.inl \
   OS_QoS.h \
   OS_String.h \
-  OS_String.inl \
   OS_TLI.h \
   OS_TLI.inl \
   OS_Thread_Adapter.h \
diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp
index 4e4cc1a461d..fcdee0e14d2 100644
--- a/ace/Message_Queue.cpp
+++ b/ace/Message_Queue.cpp
@@ -432,11 +432,7 @@ ACE_Message_Queue_NT::enqueue (ACE_Message_Block *new_item,
       size_t mlength = new_item->total_length ();
       // Note - we send ACTIVATED in the 3rd arg to tell the completion
       // routine it's _NOT_ being woken up because of deactivate().
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-      DWORD state_to_post;
-#else
       ULONG_PTR state_to_post;
-#endif
       state_to_post = ACE_Message_Queue_Base::ACTIVATED;
       if (::PostQueuedCompletionStatus (this->completion_port_,
                                         static_cast<DWORD> (msize),
@@ -475,11 +471,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item,
       ++this->cur_thrs_;        // Increase the waiting thread count.
   }
 
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-  DWORD queue_state;
-#else
   ULONG_PTR queue_state;
-#endif
   DWORD msize;
   // Get a message from the completion port.
   int retv = ::GetQueuedCompletionStatus (this->completion_port_,
diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp
deleted file mode 100644
index a985c999068..00000000000
--- a/ace/OS_Dirent.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-#include "ace/OS_Dirent.h"
-
-ACE_RCSID(ace, OS_Dirent, "$Id$")
-
diff --git a/ace/OS_Memory.cpp b/ace/OS_Memory.cpp
deleted file mode 100644
index 8a30926a8bd..00000000000
--- a/ace/OS_Memory.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "ace/OS_Memory.h"
-
-ACE_RCSID(ace, OS_Memory, "$Id$")
-
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS_Memory.inl"
-#endif /* !ACE_HAS_INLINED_OS_CALLS */
-
-#include "ace/os_include/os_stdlib.h"
-
diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h
index 8e19803100f..b972a6f44c8 100644
--- a/ace/OS_Memory.h
+++ b/ace/OS_Memory.h
@@ -39,7 +39,7 @@
 // For completeness' sake, you should probably put
 //   #define ACE_HAS_STRDUP_EMULATION
 //   #define ACE_HAS_WCSDUP_EMULATION
-// too, so that you guarantee that strdup() and wcsdup() call your 
+// too, so that you guarantee that strdup() and wcsdup() call your
 // desired mallocator and not the system mallocator.
 //
 #if !defined (ACE_MALLOC_FUNC)
@@ -259,13 +259,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include "ace/OS_NS_stdlib.h"
 
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS_Memory.inl"
-# endif /* ACE_HAS_INLINED_OSCALLS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_MEMORY_H */
diff --git a/ace/OS_Memory.inl b/ace/OS_Memory.inl
deleted file mode 100644
index 3c4912199de..00000000000
--- a/ace/OS_Memory.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#if !defined (ACE_LACKS_SBRK)
-#  include "ace/os_include/os_unistd.h"
-#endif /* !ACE_LACKS_SBRK */
-
diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index 021f664c2ab..db28de9ae00 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -1164,18 +1164,8 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \
-     && ACE_HAS_VERSIONED_NAMESPACE == 1) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # define ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_mutex_lock_cleanup_adapter)
-
-#else
-
-# define ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME ace_mutex_lock_cleanup_adapter
-
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
 
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
deleted file mode 100644
index d8db2e3c296..00000000000
--- a/ace/OS_String.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//=============================================================================
-/**
- *  @file   OS_String.cpp
- *
- *  $Id$
- *
- *  @brief  Contains definitions for class ACE_OS_String.
- */
-//=============================================================================
-
-#include "ace/OS_String.h"
-#include "ace/OS_Memory.h"
-
-ACE_RCSID (ace, OS_String, "$Id$")
-
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS_String.inl"
-#endif /* ACE_HAS_INLINED_OS_CALLS */
-
-#if defined (ACE_LACKS_WCSDUP_PROTOTYPE)
-extern "C" wchar_t *wcsdup __P ((__const wchar_t *__s));
-#endif /* ACE_LACKS_WCSDUP_PROTOTYPE */
-
diff --git a/ace/OS_String.h b/ace/OS_String.h
index 891722ca45d..510d1a412a3 100644
--- a/ace/OS_String.h
+++ b/ace/OS_String.h
@@ -28,13 +28,5 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_ctype.h"
 
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS_String.inl"
-# endif /* ACE_HAS_INLINED_OSCALLS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_STRING_H */
diff --git a/ace/OS_String.inl b/ace/OS_String.inl
deleted file mode 100644
index 64b6ef0150d..00000000000
--- a/ace/OS_String.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file   OS_String.inl
- *
- *  $Id$
- *
- *  @brief  Contains inline definitions for class ACE_OS_String.
- */
-//=============================================================================
-
-#include "ace/os_include/os_stdlib.h"
-#include "ace/os_include/os_string.h"
-#include "ace/os_include/os_strings.h"
-#include "ace/os_include/os_ctype.h"
-
-
-
diff --git a/ace/README b/ace/README
index b3ee57dd2b7..748e5164c84 100644
--- a/ace/README
+++ b/ace/README
@@ -226,10 +226,6 @@ ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 ACE_HAS_BROKEN_ACCEPT_ADDR              Platform can't correctly deal
                                         with a NULL addr to accept()
                                         (e.g, VxWorks).
-ACE_HAS_BROKEN_NAMESPACES               Compiler/platform doesn't
-                                        support namespaces (or the
-                                        support is not fully
-                                        implemented.)
 ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS Compiler can't handle const char *
                                         as rvalue in conditional operator.
 ACE_HAS_BROKEN_CONVERSIONS              Compiler can't handle calls
diff --git a/ace/Registry.h b/ace/Registry.h
index 6050b17ee6a..5b06517655b 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -556,13 +556,6 @@ private:
   static int is_local_host (const ACE_TCHAR *machine_name);
 };
 
-// Fix me!  Shouldn't have to define this stuff
-
-#if defined (ACE_HAS_BROKEN_NESTED_TEMPLATES)
-  typedef ACE_Registry::Name_Component Name_Component;
-  typedef ACE_Registry::Binding Binding;
-#endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_WIN32 */
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
deleted file mode 100644
index d6972b74a5d..00000000000
--- a/ace/Synch.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef ACE_SYNCH_CPP
-#define ACE_SYNCH_CPP
-
-#include "ace/Thread.h"
-#include "ace/ACE.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// FUZZ: disable check_for_synch_include
-#include "ace/Synch.h"
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (ace,
-           Synch,
-           "$Id$")
-
-#include "ace/TSS_Adapter.cpp"
-#include "ace/Auto_Event.cpp"
-#include "ace/Manual_Event.cpp"
-#include "ace/Barrier.cpp"
-#include "ace/Condition_Thread_Mutex.cpp"
-#include "ace/Condition_Recursive_Thread_Mutex.cpp"
-#include "ace/Event.cpp"
-#include "ace/Lock.cpp"
-#include "ace/Mutex.cpp"
-#include "ace/RW_Mutex.cpp"
-#include "ace/RW_Thread_Mutex.cpp"
-#include "ace/Recursive_Thread_Mutex.cpp"
-#include "ace/Semaphore.cpp"
-#include "ace/Thread_Mutex.cpp"
-#include "ace/Thread_Semaphore.cpp"
-
-// ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-// ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
-// ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_SYNCH_CPP */
diff --git a/ace/Versioned_Namespace.h b/ace/Versioned_Namespace.h
index ee07260220e..542254876ff 100644
--- a/ace/Versioned_Namespace.h
+++ b/ace/Versioned_Namespace.h
@@ -22,8 +22,7 @@
 #endif  /* !ACE_CONFIG_LITE_H */
 
 
-#if defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1 \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
+#if defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1
 
 # ifndef ACE_VERSIONED_NAMESPACE_NAME
 //#  include "ace/Version.h"
@@ -44,7 +43,6 @@
 #else
 
 # define ACE_VERSIONED_NAMESPACE_NAME
-
 # define ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 # define ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
index c96fa8b3040..7ace0d987b0 100644
--- a/ace/WIN32_Proactor.cpp
+++ b/ace/WIN32_Proactor.cpp
@@ -87,11 +87,7 @@ ACE_WIN32_Proactor::close (void)
         {
           ACE_OVERLAPPED *overlapped = 0;
           u_long bytes_transferred = 0;
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-          ULONG completion_key = 0;
-#else
           ULONG_PTR completion_key = 0;
-#endif
 
           // Get the next asynchronous operation that completes
           BOOL res = ::GetQueuedCompletionStatus
@@ -122,11 +118,7 @@ int
 ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
                                      const void *completion_key)
 {
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-  ULONG comp_key (reinterpret_cast<ULONG> (completion_key));
-#else
   ULONG_PTR comp_key (reinterpret_cast<ULONG_PTR> (completion_key));
-#endif
 
   // No locking is needed here as no state changes.
   ACE_HANDLE cp = ::CreateIoCompletionPort (handle,
@@ -570,11 +562,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
 {
   ACE_OVERLAPPED *overlapped = 0;
   u_long bytes_transferred = 0;
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-  ULONG completion_key = 0;
-#else
   ULONG_PTR completion_key = 0;
-#endif
 
   // Get the next asynchronous operation that completes
   BOOL result = ::GetQueuedCompletionStatus (this->completion_port_,
@@ -688,11 +676,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
       completion_key = result->completion_key();
     }
 
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-  ULONG comp_key (reinterpret_cast<ULONG> (completion_key));
-#else
   ULONG_PTR comp_key (reinterpret_cast<ULONG_PTR> (completion_key));
-#endif
 
   // Post a completion
   if (::PostQueuedCompletionStatus (this->completion_port_, // completion port
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 25ac81b80cd..88b399626f7 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -7,15 +7,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
 
-  // Old OS files.  put these back and remove the OS_NS*, Cleanup.cpp, and
-  // Object_Manager_Base.cpp to improve compile times at the cost of
-  // footprint. dhinton
-  //OS.cpp
-  //OS_Dirent.cpp
-  //OS_Memory.cpp
-  //OS_String.cpp
-  //Synch.cpp
-
   Source_Files(ACE_COMPONENTS) {
     ACE.cpp
     ACE_crc_ccitt.cpp
@@ -368,9 +359,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Guard_T.inl
     Handle_Gobbler.inl
     Lock_Adapter_T.inl
-    OS.inl
-    OS_Memory.inl
-    OS_String.inl
     Refcounted_Auto_Ptr.inl
     Reverse_Lock_T.inl
     Swap.inl
diff --git a/ace/config-irix6.x-kcc.h b/ace/config-irix6.x-kcc.h
deleted file mode 100644
index fba9cbafdea..00000000000
--- a/ace/config-irix6.x-kcc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for the SGI
-// Indigo2EX running Irix 6.5 platform using the KAI C++ compiler.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-kcc-common.h"
-#include "ace/config-irix6.x-common.h"
-
-// Denotes that GNU has cstring.h as standard
-// which redefines memchr()
-#define ACE_HAS_GNU_CSTRING_H
-
-// Compiler/platform supports SVR4 signal typedef.
-#define ACE_HAS_IRIX_53_SIGNALS
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform supports sys_siglist array.
-//#define ACE_HAS_SYS_SIGLIST
-
-// This gets defined in config-irix6.x-common.h, but kcc does support this.
-#undef ACE_LACKS_PLACEMENT_OPERATOR_DELETE
-
-// Shift this --- otherwise, it lands on top of libKCC.
-#define ACE_DEFAULT_BASE_ADDR ((char*) 0x0500000)
-
-// kcc 4.0d miscompiles memchr_emulation on irix at +K3 optimization.
-// So just use the library version instead.
-#define ACE_HAS_MEMCHR
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
deleted file mode 100644
index 8b290109a96..00000000000
--- a/ace/config-kcc-common.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// This configuration file is designed to be included by another,
-// specific configuration file.  It provides config information common
-// to all KAI C++ platforms (KCC version 3.3a).
-//
-// KAI C++ 3.2d for Linux had a known problem with being unable to call
-// static object constructors and destructors within shared libraries.
-//
-// KAI C++ 3.3a requires glibc 2. This configuration was tested with
-// egcs 1.0.2 and glibc-2.0.7-7. The KCC_BASE/bin/KCC script requires
-// the following settings for i386-linux to work:
-//
-//case i386-linux:
-//    set common_na = "-Dlinux -Dunix -Di386"
-//    set cpp_defines = "-D__CPLUSPLUS -D__inline__=inline -D__inline=inline -D__signed__=signed"
-//    set c_defines = "-D__inline__= -D__inline= -D__signed__=signed"
-//    set knr_c_defines = "-D__inline__= -D__inline= -D__signed__="
-//    set ansi_c_defines = ""
-//    breaksw
-//
-
-#ifndef ACE_KCC_COMMON_H
-#define ACE_KCC_COMMON_H
-#include /**/ "ace/pre.h"
-
-#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
-# define ACE_SIZEOF_LONG_DOUBLE 12
-#endif /* i386 */
-
-#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 /* i386 */
-
-// ****** Need to move this somewhere else
-// #define TAO_YY_BREAK
-
-#define ACE_SIZEOF_LONG_LONG 8
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
-// Compiler doesn't support static data member templates.
-//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
-// Define this if you want to use the standard C++ library
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#define ACE_HAS_STRING_CLASS
-#define ACE_HAS_STDCPP_STL_INCLUDES 1
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#define ACE_LACKS_IOSTREAM_FX 1
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-#define ACE_LACKS_UNBUFFERED_STREAMBUF 1
-#define ACE_HAS_EXCEPTIONS 1
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_NEW_THROWS_EXCEPTIONS
-
-// __KCC_VERSION is not defined before 3.4.
-#if !defined (__KCC_VERSION)
-#define ACE_AUTO_PTR_LACKS_RESET
-#endif /* !__KCC_VERSION */
-
-//#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
-
-#include /**/ "ace/post.h"
-#endif /* ACE_KCC_COMMON_H */
diff --git a/ace/config-macros.h b/ace/config-macros.h
index 9a8c22aa90a..1819b34a83a 100644
--- a/ace/config-macros.h
+++ b/ace/config-macros.h
@@ -623,6 +623,10 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \
 #  define ACE_STD_NAMESPACE
 #endif
 
+// Compiler can handle any operators in namespace, just try this for all
+// compilers, if it works we can zap this fully
+#define ACE_ANY_OPS_USE_NAMESPACE
+
 #if !defined (ACE_OS_String)
 #  define ACE_OS_String ACE_OS
 #endif /* ACE_OS_String */
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
deleted file mode 100644
index b5369247a2d..00000000000
--- a/ace/config-osf1-3.2.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for OSF1 3.2
-// platforms with the DEC 5.1 C++ compiler.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include /**/ "ace/pre.h"
-
-#define ACE_LACKS_SETSCHED
-#define ACE_LACKS_RWLOCK_T
-// DF: this platform uses Digital's CXX compiler
-#define DEC_CXX
-
-// DF: DEC's CXX supports explicit template specialization.
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-// DF: 3.2 has getpgid but no prototype defined anywhere.  So we cheat
-// and declare it here.
-extern "C" pid_t getpgid (pid_t);
-
-// DF: ACE_HAS_STRING_CLASS seems the right thing to do...
-#define ACE_HAS_STRING_CLASS
-
-// DF: Seems apropriate since this is a new compiler...
-#if !defined (__ACE_INLINE__)
-# define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-#define ACE_HAS_BROKEN_MSG_H
-#define ACE_LACKS_SYSV_MSQ_PROTOS
-
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// Platform supports <sys/procfs.h>
-#define ACE_HAS_PROC_FS
-
-#define ACE_HAS_UALARM
-
-// If ACE doesn't compile due to the lack of these methods, please
-// send email to schmidt@cs.wustl.edu reporting this.
-// #define ACE_LACKS_CONDATTR_PSHARED
-// #define ACE_LACKS_MUTEXATTR_PSHARED
-
-// Platform lacks support for stack address information
-#define ACE_LACKS_THREAD_STACK_ADDR
-
-// Platform lacks thread process scoping
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-
-// Platform has non-POSIX setkind and other functions.
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_HAS_SETKIND_NP
-
-// Platform supports POSIX.1b clock_gettime ()
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CLOCK_SETTIME
-
-// Platform defines MAP_FAILED as a long constant.
-#define ACE_HAS_LONG_MAP_FAILED
-
-// Platform's implementation of sendmsg() has a non-const msgheader parameter.
-#define ACE_HAS_NONCONST_SENDMSG
-
-// Platform's implementation of writev() has a non-const iovec parameter.
-#define ACE_HAS_NONCONST_WRITEV
-
-// Platform's implementation of setlrmit() has a non-const rlimit parameter.
-#define ACE_HAS_NONCONST_SETRLIMIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
-
-// Compiler/platform correctly calls init()/fini().
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform has thread-specific storage
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// Platform supports C++ headers
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Platform supports the OSF ACE_TLI timod STREAMS module.
-#define ACE_HAS_OSF_TIMOD_H
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME
-
-// Platform defines struct timespec in <sys/timers.h>
-#define ACE_HAS_BROKEN_POSIX_TIME
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-// ACE supports POSIX Pthreads. OSF/1 3.2 has draft 4
-#define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_DRAFT4
-#define ACE_HAS_THREAD_SELF
-
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Added 6/13/95, 1 line
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_UCONTEXT_T
-
-// Compiler/platform has ssize_t.
-#define ACE_HAS_SSIZE_T
-
-// Compiler/platform supports struct strbuf.
-#define ACE_HAS_STRBUF_T
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS
-
-// Platform has 64bit longs and 32bit ints...
-#define ACE_SIZEOF_LONG 8
-
-// Platform supports STREAM pipes.
-// #define ACE_HAS_STREAM_PIPES
-
-// Compiler/platform supports SVR4 dynamic linking semantics.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// Platform support OSF1 gettimeofday
-#define ACE_HAS_OSF1_GETTIMEOFDAY
-
-// Compiler/platform supports SVR4 signal typedef.
-#define ACE_HAS_SVR4_SIGNAL_T
-
-// Compiler/platform has strerror().
-#define ACE_HAS_STRERROR
-
-// ACE supports threads.
-#define ACE_HAS_THREADS
-
-// Platform supports ACE_TLI tiuser header.
-#define ACE_HAS_TIUSER_H
-
-// Platform supports ACE_TLI timod STREAMS module.
-// #define ACE_HAS_TIMOD_H
-
-// Platform provides ACE_TLI function prototypes.
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform supports ACE_TLI.
-#define ACE_HAS_TLI
-
-// Compile using multi-thread libraries.
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 8192
-#define ACE_HAS_GETPAGESIZE
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index a931bb47ec9..2be213db3af 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -6,8 +6,8 @@
 
 // The following configuration file is designed to work for the
 // Digital UNIX V4.0a through V4.0d 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,
+// cxx 5.4 and later, Rational RCC (2.4.1) 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
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 1d387d61318..df0d32c6e0e 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -147,10 +147,6 @@
   // IOStream_Test never halts with Green Hills 1.8.9.
 # define ACE_LACKS_ACE_IOSTREAM
 
-#elif defined (__KCC) /* KAI compiler */
-
-# include "ace/config-kcc-common.h"
-
 #else  /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #    error unsupported compiler in ace/config-sunos5.5.h
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index af49824b680..23af0e4cf8e 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -30,8 +30,6 @@
 # if DIGITAL_UNIX >= 0x40E
 #   define ACE_LACKS_STDINT_H
 # endif /* DIGITAL_UNIX >= 0x40E */
-#else  /* ! DIGITAL_UNIX */
-# include "ace/config-osf1-3.2.h"
 #endif /* ! DIGITAL_UNIX */
 
 #include /**/ "ace/post.h"
diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h
deleted file mode 100644
index 63c40e60d54..00000000000
--- a/ace/config-win32-msvc-6.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   config-win32-msvc-6.h
- *
- *  $Id$
- *
- *  @brief  Microsoft Visual C++ 6.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 6.
- *
- *  @note   Do not include this file directly, include config-win32.h instead.
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_6_H
-#define ACE_CONFIG_WIN32_MSVC_6_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-// The std library that comes with VC6 is pre-standard, but
-// it's close enough that any discrepancies should be worked around
-// with individual hacks.
-# if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# endif
-
-// The STL that comes with ACE uses the std namespace. Note however, it is not
-// part of the standard C++ library
-# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#  define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-# if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES)
-#  define ACE_HAS_BROKEN_NESTED_TEMPLATES
-# endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */
-
-// Keywords
-
-# define ACE_HAS_TYPENAME_KEYWORD
-
-// No support for member templates.
-#define ACE_LACKS_MEMBER_TEMPLATES
-
-#define ACE_HAS_ITOA
-
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-
-# if !defined (ACE_HAS_WINCE)
-#  define ACE_HAS_EXCEPTIONS
-#  define ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS
-#  define ACE_HAS_NO_THROW_SPEC
-#  define ACE_HAS_SIG_ATOMIC_T
-# endif /* ACE_HAS_WINCE */
-
-// CE SDKs didn't provide some errno values we need in eVC3 and 4 (which
-// are the same base compiler version as MSVC 6).
-#if defined (ACE_HAS_WINCE)
-#  define EMFILE WSAEMFILE
-#  define EINTR  WSAEINTR
-#  define EACCES ERROR_ACCESS_DENIED
-#  define ENOSPC ERROR_HANDLE_DISK_FULL
-#  define EEXIST ERROR_FILE_EXISTS
-#  define EPIPE  ERROR_BROKEN_PIPE
-#  define EFAULT WSAEFAULT
-#  define ENOENT WSAEINVAL
-#  define EINVAL WSAEINVAL
-#  define ERANGE WSAEINVAL
-#  define EAGAIN WSAEWOULDBLOCK
-#  define ENOMEM ERROR_OUTOFMEMORY
-#  define ENODEV ERROR_BAD_DEVICE
-#  define _MAX_FNAME 255
-//#endif  // UNDER_CE
-#endif /* ACE_HAS_WINCE */
-
-# define ACE_HAS_BROKEN_NAMESPACES
-# define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST
-# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-
-# define ACE_LACKS_INTPTR_T
-
-// Compiler doesn't support static data member templates.
-# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
-# define ACE_LACKS_STRRECVFD
-
-// Compiler/platform has correctly prototyped header files.
-# define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Platform supports POSIX timers via timestruc_t.
-# define ACE_HAS_STRPTIME
-# define ACE_LACKS_NATIVE_STRPTIME
-
-// Compiler/platform supports strerror ().
-# define ACE_HAS_STRERROR
-
-# define ACE_TEMPLATES_REQUIRE_SOURCE
-
-// Platform provides ACE_TLI function prototypes.
-// For Win32, this is not really true, but saves a lot of hassle!
-# define ACE_HAS_TLI_PROTOTYPES
-
-// Platform support linebuffered streaming is broken
-# define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-// Template specialization is supported.
-# define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-
-// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
-// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
-# define ACE_NEEDS_FUNC_DEFINITIONS
-
-// ----------------- "derived" defines and includes -----------
-
-# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-// Platform has its Standard C++ library in the namespace std
-#   if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#    define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
-#   endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-// Microsoft's auto_ptr in standard cpp library doesn't have reset ().
-#  define ACE_AUTO_PTR_LACKS_RESET
-
-// ace/iostream.h does not work with the standard cpp library (yet).
-#  if !defined (ACE_USES_OLD_IOSTREAMS)
-#   define ACE_LACKS_ACE_IOSTREAM
-#  endif /* ! ACE_USES_OLD_IOSTREAMS */
-# else
-// iostream header lacks ipfx (), isfx (), etc., declarations
-#  define ACE_LACKS_IOSTREAM_FX
-# endif
-
-// While digging the MSVC 4.0 include files, I found how to disable
-// MSVC warnings: --Amos Shapira
-
-
-// "C4355: 'this' : used in base member initializer list"
-# pragma warning(disable:4355) /* disable C4514 warning */
-//      #pragma warning(default:4355)   // use this to reenable, if desired
-
-# pragma warning(disable:4201)  /* winnt.h uses nameless structs */
-
-# pragma warning(disable:4231)
-// Disable warning of using Microsoft Extension.
-
-// MSVC allows throw keyword but complains about it.
-# pragma warning( disable : 4290 )
-
-// Inheritance by dominance is A-OK by us
-# pragma warning (disable:4250)
-
-// Disable warning about long names (due to templates).
-# pragma warning( disable : 4786 )
-
-# if !defined(ACE_HAS_WINCE)
-#  if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0)
-#   if !defined(_DLL)
-// *** DO NOT *** DO NOT *** defeat this error message
-// by defining _DLL yourself.  RTFM and see who set _DLL.
-#    error You must link against (Debug) Multithreaded DLL run-time libraries.
-#   endif /* !_DLL */
-#  endif  /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */
-# endif /* !ACE_HAS_WINCE */
-
-# pragma warning(default: 4201)  /* winnt.h uses nameless structs */
-
-# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
-# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_6_H */
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index 22e99f200c8..fd28598d0f4 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -41,7 +41,6 @@
 
 #define ACE_HAS_ITOA
 
-#define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 
 #define ACE_ITOA_EQUIVALENT ::_itoa
@@ -62,9 +61,7 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-#if (_MSC_VER >= 1310)
-#  define ACE_HAS_TEMPLATE_TYPEDEFS
-#endif
+#define ACE_HAS_TEMPLATE_TYPEDEFS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index 6f91aa0416d..6fbcca6de4c 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -36,7 +36,6 @@
 
 #define ACE_HAS_ITOA
 
-#define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 
 #define ACE_ITOA_EQUIVALENT ::_itoa
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index a28d2805d17..7ad2b01901e 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -67,13 +67,9 @@
 
 #if (_MSC_VER >= 1400)
 # include "ace/config-win32-msvc-8.h"
-#elif (_MSC_VER >= 1300)
+#elif (_MSC_VER >= 1310)
 # include "ace/config-win32-msvc-7.h"
-// FUZZ: disable check_for_msc_ver
-#elif (_MSC_VER >= 1200)
-# include "ace/config-win32-msvc-6.h"
-#else
-# error This version of Microsoft Visual C++ not supported.
+# error This version of Microsoft Visual C++ is not supported.
 #endif
 
 #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index 681381fc945..451687a00b2 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -52,7 +52,6 @@
 #define ACE_LACKS_MKTEMP
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define NSIG 23 /* Maximum no. of signals + 1 */
-#define ACE_HAS_BROKEN_NESTED_TEMPLATES 1
 #define ACE_HAS_CPLUSPLUS_HEADERS 1
 #define ACE_HAS_EXCEPTIONS 1
 #define ACE_HAS_GNU_CSTRING_H 1
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index e91c380c7b0..2c4d751ae87 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -56,6 +56,7 @@ TAO/tests/Bug_2349_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !ST
 TAO/tests/Bug_2429_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2494_Regression/run_test.pl: !ST
+TAO/tests/Bug_2503_Regression/run_test.pl: !ST
 TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !IPV6