ChangeLogTag: Fri Apr 26 21:56:33 2002 Balachandran Natarajan <bala@guajira.cs.wustl.edu>connection_timeout_1

20 files changed, 476 insertions, 221 deletions

diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog
index 9fe2cc53d8c..d2035f6ccf9 100644
--- a/TAO/tao/ChangeLog
+++ b/TAO/tao/ChangeLog
@@ -1,3 +1,26 @@
+Fri Apr 26 21:56:33 2002  Balachandran Natarajan  <bala@guajira.cs.wustl.edu>
+
+	* tao/DynamicAny/DynamicAnyC.cpp:
+	* tao/DynamicInterface/Unknown_User_Exception.cpp:
+	* tao/IORManipulation/IORC.cpp:
+	* tao/IORManipulation/IORC.i:
+	* tao/IORTable/IORTableC.cpp:
+	* tao/IORTable/IORTableC.i:
+	* tao/Messaging/Messaging.h:
+	* tao/Messaging/Messaging_ORBInitializer.cpp:
+	* tao/Messaging/Messaging_PolicyFactory.cpp:
+	* tao/Messaging/Messaging_Policy_i.cpp:
+	* tao/Messaging/Messaging_Policy_i.h:
+	* tao/PortableServer/Active_Object_Map.cpp:
+	* tao/PortableServer/ImplRepoC.cpp:
+	* tao/PortableServer/ImplRepoC.i:
+	* tao/PortableServer/Object_Adapter.cpp:
+	* tao/PortableServer/POA.cpp:
+	* tao/PortableServer/PortableServerC.cpp:
+	* tao/PortableServer/PortableServerC.i:
+	* tao/RTCORBA/RTCORBAC.cpp: Yet another merge with the main trunk.
+
+
 Fri Apr 26 18:24:02 2002  Balachandran Natarajan  <bala@guajira.cs.wustl.edu>
 
 	* tao/BoundsC.cpp:
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 5d771f6daf7..da91919ac68 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -342,7 +342,10 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const
 
 // Default constructor.
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
-  : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
+        "InvalidValue"
+      )
 {
 }
 
@@ -353,7 +356,10 @@ DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
 
 // Copy constructor.
 DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -368,7 +374,7 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid
 DynamicAny::DynAny::InvalidValue *
 DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidValue *, exc);
     }
@@ -420,7 +426,10 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
 
 // Default constructor.
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
-  : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
+        "TypeMismatch"
+      )
 {
 }
 
@@ -431,7 +440,10 @@ DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
 
 // Copy constructor.
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -446,7 +458,7 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis
 DynamicAny::DynAny::TypeMismatch *
 DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (TypeMismatch *, exc);
     }
@@ -3653,7 +3665,10 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
 
 // Default constructor.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
-  : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
+        "InconsistentTypeCode"
+      )
 {
 }
 
@@ -3664,7 +3679,10 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
 
 // Copy constructor.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -3679,7 +3697,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::
 DynamicAny::DynAnyFactory::InconsistentTypeCode *
 DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InconsistentTypeCode *, exc);
     }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 92e560b019a..f313206f320 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -6,13 +6,15 @@
 ACE_RCSID(DynamicInterface, Unknown_User_Exception, "$Id$")
 
 CORBA_UnknownUserException::CORBA_UnknownUserException (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0"),
+  : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
+                         "UnknownUserException"),
     exception_ (0)
 {
 }
 
 CORBA_UnknownUserException::CORBA_UnknownUserException (CORBA_Any &ex)
-  : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
+                         "UnknownUserException")
 {
   ACE_NEW (this->exception_,
            CORBA_Any (ex));
@@ -21,7 +23,8 @@ CORBA_UnknownUserException::CORBA_UnknownUserException (CORBA_Any &ex)
 CORBA_UnknownUserException::CORBA_UnknownUserException (
     const CORBA_UnknownUserException& e
   )
-  : CORBA_UserException (e._id ())
+  : CORBA_UserException (e._rep_id (),
+                         e._name ())
 {
   ACE_NEW (this->exception_,
            CORBA_Any (*e.exception_));
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index a49cc3789cd..943dcaf54c3 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -41,7 +41,10 @@
 
 // Default constructor.
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
-  : CORBA_UserException ("IDL:TAO_IOP/EmptyProfileList:1.0")
+  : CORBA_UserException (
+        "IDL:TAO_IOP/EmptyProfileList:1.0",
+        "EmptyProfileList"
+      )
 {
 }
 
@@ -52,7 +55,10 @@ TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
 
 // Copy constructor.
 TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -73,7 +79,7 @@ void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
 TAO_IOP::EmptyProfileList *
 TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (EmptyProfileList *, exc);
     }
@@ -177,7 +183,10 @@ CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
 
 // Default constructor.
 TAO_IOP::NotFound::NotFound (void)
-  : CORBA_UserException ("IDL:TAO_IOP/NotFound:1.0")
+  : CORBA_UserException (
+        "IDL:TAO_IOP/NotFound:1.0",
+        "NotFound"
+      )
 {
 }
 
@@ -188,7 +197,10 @@ TAO_IOP::NotFound::~NotFound (void)
 
 // Copy constructor.
 TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -209,7 +221,7 @@ void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 TAO_IOP::NotFound *
 TAO_IOP::NotFound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NotFound *, exc);
     }
@@ -309,7 +321,10 @@ CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
 
 // Default constructor.
 TAO_IOP::Duplicate::Duplicate (void)
-  : CORBA_UserException ("IDL:TAO_IOP/Duplicate:1.0")
+  : CORBA_UserException (
+        "IDL:TAO_IOP/Duplicate:1.0",
+        "Duplicate"
+      )
 {
 }
 
@@ -320,7 +335,10 @@ TAO_IOP::Duplicate::~Duplicate (void)
 
 // Copy constructor.
 TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -341,7 +359,7 @@ void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
 TAO_IOP::Duplicate *
 TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (Duplicate *, exc);
     }
@@ -441,7 +459,10 @@ CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
 
 // Default constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
-  : CORBA_UserException ("IDL:TAO_IOP/Invalid_IOR:1.0")
+  : CORBA_UserException (
+        "IDL:TAO_IOP/Invalid_IOR:1.0",
+        "Invalid_IOR"
+      )
 {
 }
 
@@ -452,7 +473,10 @@ TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
 
 // Copy constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -473,7 +497,7 @@ void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer)
 TAO_IOP::Invalid_IOR *
 TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (Invalid_IOR *, exc);
     }
@@ -573,7 +597,10 @@ CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
 
 // Default constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (void)
-  : CORBA_UserException ("IDL:TAO_IOP/MultiProfileList:1.0")
+  : CORBA_UserException (
+        "IDL:TAO_IOP/MultiProfileList:1.0",
+        "MultiProfileList"
+      )
 {
 }
 
@@ -584,7 +611,10 @@ TAO_IOP::MultiProfileList::~MultiProfileList (void)
 
 // Copy constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -605,7 +635,7 @@ void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
 TAO_IOP::MultiProfileList *
 TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (MultiProfileList *, exc);
     }
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index c544b793ca9..a87fece232f 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -430,7 +430,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::EmptyProfileList &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
@@ -444,7 +444,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::EmptyProfileList&)
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::NotFound &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
@@ -458,7 +458,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::NotFound&)
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Duplicate &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
@@ -472,7 +472,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Duplicate&)
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Invalid_IOR &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
@@ -486,7 +486,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Invalid_IOR&)
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::MultiProfileList &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index c2f25f49be8..6b84ca74907 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -41,7 +41,10 @@
 
 // Default constructor.
 IORTable::AlreadyBound::AlreadyBound (void)
-  : CORBA_UserException ("IDL:IORTable/AlreadyBound:1.0")
+  : CORBA_UserException (
+        "IDL:IORTable/AlreadyBound:1.0",
+        "AlreadyBound"
+      )
 {
 }
 
@@ -52,7 +55,10 @@ IORTable::AlreadyBound::~AlreadyBound (void)
 
 // Copy constructor.
 IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -73,7 +79,7 @@ void IORTable::AlreadyBound::_tao_any_destructor (void *_tao_void_pointer)
 IORTable::AlreadyBound *
 IORTable::AlreadyBound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (AlreadyBound *, exc);
     }
@@ -135,7 +141,10 @@ void IORTable::AlreadyBound::_tao_decode (
 
 // Default constructor.
 IORTable::NotFound::NotFound (void)
-  : CORBA_UserException ("IDL:IORTable/NotFound:1.0")
+  : CORBA_UserException (
+        "IDL:IORTable/NotFound:1.0",
+        "NotFound"
+      )
 {
 }
 
@@ -146,7 +155,10 @@ IORTable::NotFound::~NotFound (void)
 
 // Copy constructor.
 IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -167,7 +179,7 @@ void IORTable::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 IORTable::NotFound *
 IORTable::NotFound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NotFound *, exc);
     }
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i
index 2de74162f1b..a87e7d21564 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.i
@@ -44,7 +44,7 @@
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::AlreadyBound &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
@@ -58,7 +58,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::AlreadyBound&)
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::NotFound &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index 6f3161f5238..4994282ae7c 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -44,6 +44,8 @@ TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
 #include "MessagingC.h"
 #undef TAO_MESSAGING_SAFE_INCLUDE
 
+#include "tao/TAOC.h"
+
 // Typedef for the Reply Handler Skeleton.
 // This is handcrafted not generated by the IDL compiler.
 
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index c8cd20ea464..0bd34bdda96 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -2,13 +2,13 @@
 
 #include "Messaging_ORBInitializer.h"
 
-
-
 #include "Messaging_Policy_i.h"
 #include "Messaging_PolicyFactory.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Messaging, Messaging_ORBInitializer, "$Id$")
+ACE_RCSID (Messaging,
+           Messaging_ORBInitializer,
+           "$Id$")
 
 void
 TAO_Messaging_ORBInitializer::pre_init (
@@ -33,7 +33,7 @@ TAO_Messaging_ORBInitializer::post_init (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                    ACE_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -66,27 +66,48 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
   // the different types of Messaging policies.
 
   CORBA::PolicyType type[] = {
-    TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE
-    , TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE
+#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
+    Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
+#endif  /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
+#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
+    Messaging::SYNC_SCOPE_POLICY_TYPE,
+#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-    , TAO_BUFFERING_CONSTRAINT_POLICY_TYPE
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-    , TAO_MESSAGING_REBIND_POLICY_TYPE
-    , TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE
-    , TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE
-    , TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE
-    , TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE
-    , TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE
-    , TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE
-    , TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE
-    , TAO_MESSAGING_ROUTING_POLICY_TYPE
-    , TAO_MESSAGING_MAX_HOPS_POLICY_TYPE
-    , TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE
+    TAO_BUFFERING_CONSTRAINT_POLICY_TYPE,
+#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+#if (TAO_HAS_REBIND_POLICY == 1)
+    Messaging::REBIND_POLICY_TYPE,
+#endif  /* TAO_HAS_REBIND_POLICY == 1 */
+#if (TAO_HAS_PRIORITY_POLICIES == 1)
+    Messaging::REQUEST_PRIORITY_POLICY_TYPE,
+    Messaging::REPLY_PRIORITY_POLICY_TYPE,
+#endif  /* TAO_HAS_PRIORITY_POLICIES == 1 */
+#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
+    Messaging::REQUEST_START_TIME_POLICY_TYPE,
+#endif  /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
+#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
+    Messaging::REQUEST_END_TIME_POLICY_TYPE,
+#endif  /*TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
+#if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
+    Messaging::REPLY_START_TIME_POLICY_TYPE,
+#endif  /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
+#if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
+    Messaging::REPLY_END_TIME_POLICY_TYPE,
+#endif  /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
+#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
+    Messaging::RELATIVE_REQ_TIMEOUT_POLICY_TYPE,
+#endif  /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
+#if (TAO_HAS_ROUTING_POLICY == 1)
+    Messaging::ROUTING_POLICY_TYPE,
+#endif  /* TAO_HAS_ROUTING_POLICY == 1 */
+#if (TAO_HAS_MAX_HOPS_POLICY == 1)
+    Messaging::MAX_HOPS_POLICY_TYPE,
+#endif  /* TAO_HAS_MAX_HOPS_POLICY == 1 */
+    Messaging::QUEUE_ORDER_POLICY_TYPE
   };
 
-  for (CORBA::PolicyType *i = type;
-       i != type + sizeof(type)/sizeof(type[0]);
-       ++i)
+  const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]);
+  for (CORBA::PolicyType *i = type; i != end; ++i)
     {
       ACE_TRY
         {
@@ -116,5 +137,3 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
       ACE_CHECK;
     }
 }
-
-
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 0cae6016abf..4ffdfedb4ee 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,14 +1,11 @@
-// -*- C++ -*-
-//
-// $Id$
-
 #include "Messaging_PolicyFactory.h"
 
-ACE_RCSID (tao, Messaging_PolicyFactory, "$Id$")
-
-
+ACE_RCSID (tao,
+           Messaging_PolicyFactory,
+           "$Id$")
 
 #include "Messaging_Policy_i.h"
+
 #include "tao/PolicyC.h"
 #include "tao/Buffering_Constraint_Policy.h"
 
@@ -20,52 +17,56 @@ TAO_Messaging_PolicyFactory::create_policy (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
-  switch (type)
-    {
-
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-
-  case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
-      return TAO_RelativeRoundtripTimeoutPolicy::create (
-               value
-               ACE_ENV_ARG_PARAMETER);
-
+  if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE)
+    return TAO_RelativeRoundtripTimeoutPolicy::create (value
+                                                       ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
-
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-    case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE:
-      return TAO_Sync_Scope_Policy::create (value
-                                            ACE_ENV_ARG_PARAMETER);
-
+  if (type == Messaging::SYNC_SCOPE_POLICY_TYPE)
+    return TAO_Sync_Scope_Policy::create (value
+                                          ACE_ENV_ARG_PARAMETER);
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-    case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE:
-      return TAO_Buffering_Constraint_Policy::create (value
-                                                      ACE_ENV_ARG_PARAMETER);
-
+  if (type == TAO_BUFFERING_CONSTRAINT_POLICY_TYPE)
+    return TAO_Buffering_Constraint_Policy::create (value
+                                                    ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
-    case TAO_MESSAGING_REBIND_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE:
-    case TAO_MESSAGING_ROUTING_POLICY_TYPE:
-    case TAO_MESSAGING_MAX_HOPS_POLICY_TYPE:
-    case TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE:
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY),
-                        CORBA::Policy::_nil ());
-
-    default:
-      break;
-    }
+  if (
+#if (TAO_HAS_REBIND_POLICY == 1)
+      type == Messaging::REBIND_POLICY_TYPE ||
+#endif  /* TAO_HAS_REBIND_POLICY == 1 */
+#if (TAO_HAS_PRIORITY_POLICIES == 1)
+      type == Messaging::REQUEST_PRIORITY_POLICY_TYPE ||
+      type == Messaging::REPLY_PRIORITY_POLICY_TYPE ||
+#endif  /* TAO_HAS_PRIORITY_POLICIES == 1 */
+#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
+      type == Messaging::REQUEST_START_TIME_POLICY_TYPE ||
+#endif  /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
+#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
+      type == Messaging::REQUEST_END_TIME_POLICY_TYPE ||
+#endif  /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
+#if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
+      type == Messaging::REPLY_START_TIME_POLICY_TYPE ||
+#endif  /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
+#if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
+      type == Messaging::REPLY_END_TIME_POLICY_TYPE ||
+#endif  /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
+#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
+      type == Messaging::RELATIVE_REQ_TIMEOUT_POLICY_TYPE ||
+#endif  /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
+#if (TAO_HAS_ROUTING_POLICY == 1)
+      type == Messaging::ROUTING_POLICY_TYPE ||
+#endif  /* TAO_HAS_ROUTING_POLICY == 1 */
+#if (TAO_HAS_MAX_HOPS_POLICY == 1)
+      type == Messaging::MAX_HOPS_POLICY_TYPE ||
+#endif  /* TAO_HAS_MAX_HOPS_POLICY == 1 */
+      type == Messaging::QUEUE_ORDER_POLICY_TYPE)
+    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY),
+                      CORBA::Policy::_nil ());
 
   ACE_UNUSED_ARG (value);
 
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index 6db2b579946..06de6392af9 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -4,7 +4,9 @@
 #include "tao/Stub.h"
 #include "tao/debug.h"
 
-ACE_RCSID(TAO, Messaging_Policy_i, "$Id$")
+ACE_RCSID (TAO,
+           Messaging_Policy_i,
+           "$Id$")
 
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
@@ -12,12 +14,14 @@ ACE_RCSID(TAO, Messaging_Policy_i, "$Id$")
 #include "tao/Messaging/Messaging_Policy_i.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry)
+TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
+  const TimeBase::TimeT& relative_expiry)
   :  relative_expiry_ (relative_expiry)
 {
 }
 
-TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TAO_RelativeRoundtripTimeoutPolicy &rhs)
+TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
+  const TAO_RelativeRoundtripTimeoutPolicy &rhs)
   : Messaging::RelativeRoundtripTimeoutPolicy (),
     TAO_Local_RefCounted_Object (),
     relative_expiry_ (rhs.relative_expiry_)
@@ -25,19 +29,19 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TA
 }
 
 TimeBase::TimeT
-TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->relative_expiry_;
 }
 
 CORBA::PolicyType
-TAO_RelativeRoundtripTimeoutPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RelativeRoundtripTimeoutPolicy::policy_type (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Future policy implementors: notice how this minimizes the
-  // footprint of the class.
-  return TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE;
+  return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE;
 }
 
 void
@@ -46,12 +50,10 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                                           int &has_timeout,
                                           ACE_Time_Value &time_value)
 {
-  CORBA::Policy_var policy = 0;
-
-  if (stub == 0)
-    policy = orb_core->stubless_relative_roundtrip_timeout ();
-  else
-    policy = stub->relative_roundtrip_timeout ();
+  CORBA::Policy_var policy =
+    (stub == 0
+     ? orb_core->stubless_relative_roundtrip_timeout ()
+     : stub->relative_roundtrip_timeout ());
 
   if (CORBA::is_nil (policy.in ()))
     {
@@ -61,8 +63,9 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
   ACE_TRY_NEW_ENV
     {
       Messaging::RelativeRoundtripTimeoutPolicy_var p =
-        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
+        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
+          policy.in ()
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -78,13 +81,13 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
       if (TAO_debug_level > 0)
         {
           CORBA::ULong msecs =
-            ACE_static_cast(CORBA::ULong, microseconds / 1000);
+            ACE_static_cast (CORBA::ULong, microseconds / 1000);
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
                       msecs));
         }
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  ACE_CATCHANY
     {
       // Ignore all exceptions...
     }
@@ -198,18 +201,10 @@ void
 TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
                              TAO_Stub *stub,
                              int &has_synchronization,
-                             int &scope)
+                             Messaging::SyncScope &scope)
 {
-  CORBA::Policy_var policy;
-
-  if (stub == 0)
-    {
-      CORBA::Policy_ptr tmp;
-      orb_core->stubless_sync_scope (tmp);
-      policy = tmp;
-    }
-  else
-    policy = stub->sync_scope ();
+  CORBA::Policy_var policy =
+    (stub == 0 ? orb_core->stubless_sync_scope () : stub->sync_scope ());
 
   if (CORBA::is_nil (policy.in ()))
     {
@@ -231,9 +226,10 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
                 CORBA::COMPLETED_NO));
 
       has_synchronization = 1;
-      scope = p->synchronization ();
+      scope = p->synchronization (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  ACE_CATCHANY
     {
       // Ignore all exceptions...
     }
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 23b3d5772f9..8dba81af5b9 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -113,7 +113,7 @@ public:
   static void hook (TAO_ORB_Core *orb_core,
                     TAO_Stub *stub,
                     int &has_synchronization,
-                    int &scope);
+                    Messaging::SyncScope &scope);
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 5d23647a7ae..b36669d417a 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -952,12 +952,16 @@ template class auto_ptr<TAO_Id_Hint_Strategy>;
 template class auto_ptr<TAO_Active_Object_Map::servant_map>;
 template class auto_ptr<TAO_Active_Object_Map::user_id_map>;
 
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 // Common typedefs.
 typedef PortableServer::ObjectId id;
@@ -1055,12 +1059,16 @@ template class ACE_Map_Entry<servant, value>;
 #pragma instantiate auto_ptr<TAO_Active_Object_Map::servant_map>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map::user_id_map>
 
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 // Common typedefs.
 typedef PortableServer::ObjectId id;
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 9745b20a8e2..bd55dd836e9 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -4983,7 +4983,10 @@ const char* ImplementationRepository::Administration::_interface_repository_id (
 
 // Default constructor.
 ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (void)
-  : CORBA_UserException ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0")
+  : CORBA_UserException (
+        "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0",
+        "AlreadyRegistered"
+      )
 {
 }
 
@@ -4994,7 +4997,10 @@ ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered
 
 // Copy constructor.
 ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5015,7 +5021,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destr
 ImplementationRepository::Administration::AlreadyRegistered *
 ImplementationRepository::Administration::AlreadyRegistered::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (AlreadyRegistered *, exc);
     }
@@ -5125,7 +5131,10 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::AlreadyRegistered:
 
 // Default constructor.
 ImplementationRepository::Administration::CannotActivate::CannotActivate (void)
-  : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0")
+  : CORBA_UserException (
+        "IDL:ImplementationRepository/Administration/CannotActivate:1.0",
+        "CannotActivate"
+      )
 {
 }
 
@@ -5136,7 +5145,10 @@ ImplementationRepository::Administration::CannotActivate::~CannotActivate (void)
 
 // Copy constructor.
 ImplementationRepository::Administration::CannotActivate::CannotActivate (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->reason = CORBA::string_dup (_tao_excp.reason.in ());
 }
@@ -5159,7 +5171,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_any_destruct
 ImplementationRepository::Administration::CannotActivate *
 ImplementationRepository::Administration::CannotActivate::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (CannotActivate *, exc);
     }
@@ -5222,7 +5234,10 @@ void ImplementationRepository::Administration::CannotActivate::_tao_decode (
 ImplementationRepository::Administration::CannotActivate::CannotActivate (
     const char * _tao_reason
   )
-  : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0")
+  : CORBA_UserException (
+        "IDL:ImplementationRepository/Administration/CannotActivate:1.0",
+        "CannotActivate"
+      )
 {
   this->reason = CORBA::string_dup (_tao_reason);
 }
@@ -5280,7 +5295,10 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::CannotActivate::_t
 
 // Default constructor.
 ImplementationRepository::Administration::NotFound::NotFound (void)
-  : CORBA_UserException ("IDL:ImplementationRepository/Administration/NotFound:1.0")
+  : CORBA_UserException (
+        "IDL:ImplementationRepository/Administration/NotFound:1.0",
+        "NotFound"
+      )
 {
 }
 
@@ -5291,7 +5309,10 @@ ImplementationRepository::Administration::NotFound::~NotFound (void)
 
 // Copy constructor.
 ImplementationRepository::Administration::NotFound::NotFound (const ::ImplementationRepository::Administration::NotFound &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5312,7 +5333,7 @@ void ImplementationRepository::Administration::NotFound::_tao_any_destructor (vo
 ImplementationRepository::Administration::NotFound *
 ImplementationRepository::Administration::NotFound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NotFound *, exc);
     }
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 489341a9ec6..d2ceec3a705 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -1614,7 +1614,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::AlreadyRegistered &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
@@ -1628,7 +1628,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::A
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::CannotActivate &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
   {
     // now marshal the members (if any)
     if (
@@ -1656,7 +1656,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,ImplementationRepositor
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::NotFound &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 30350647903..c31f8486bf0 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1681,8 +1681,12 @@ typedef ACE_Noop_Key_Generator<key> noop_key_generator;
 template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>;
 template class auto_ptr<TAO_Object_Adapter::transient_poa_map>;
 
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 template class ACE_Noop_Key_Generator<key>;
 
@@ -1759,8 +1763,12 @@ typedef ACE_Noop_Key_Generator<key> noop_key_generator;
 #pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy>
 #pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map>
 
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #pragma instantiate ACE_Noop_Key_Generator<key>
 
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index d97fc094e14..da25ccd530e 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -1,7 +1,9 @@
-// @(#) $Id$
-
 #include "tao/PortableServer/POA.h"
 
+ACE_RCSID (TAO_PortableServer,
+           POA,
+           "$Id$")
+
 //
 // ImplRepo related.
 //
@@ -40,8 +42,6 @@
 # include "POA.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, POA, "$Id$")
-
 // This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
 // It's an array of octets representing ^t^a^o/0 in octal.
 CORBA::Octet
@@ -4139,8 +4139,6 @@ TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref,
 
 template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
 
-//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
 template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
 template class ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>;
 template class ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
@@ -4156,14 +4154,20 @@ template class ACE_Array_Base <IOP::ProfileId>;
 
 //template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class auto_ptr<TAO_Active_Object_Map>;
+
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
+template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
 template class ACE_Node<TAO_POA *>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>
 
-//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
 #pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
@@ -4178,6 +4182,14 @@ template class ACE_Node<TAO_POA *>;
 
 //#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map>
+
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
 #pragma instantiate ACE_Node<TAO_POA *>
 #pragma instantiate ACE_Array_Base <IOP::ProfileId>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 217364844c8..205005ecc13 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -297,7 +297,10 @@ TAO_NAMESPACE_END
 
 // Default constructor.
 PortableServer::ForwardRequest::ForwardRequest (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/ForwardRequest:1.0",
+        "ForwardRequest"
+      )
 {
 }
 
@@ -308,7 +311,10 @@ PortableServer::ForwardRequest::~ForwardRequest (void)
 
 // Copy constructor.
 PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
 }
@@ -331,7 +337,7 @@ void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointe
 PortableServer::ForwardRequest *
 PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (ForwardRequest *, exc);
     }
@@ -394,7 +400,10 @@ void PortableServer::ForwardRequest::_tao_decode (
 PortableServer::ForwardRequest::ForwardRequest (
     const CORBA::Object_ptr  _tao_forward_reference
   )
-  : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/ForwardRequest:1.0",
+        "ForwardRequest"
+      )
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
@@ -471,7 +480,10 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
 
 // Default constructor.
 PortableServer::NotAGroupObject::NotAGroupObject (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/NotAGroupObject:1.0",
+        "NotAGroupObject"
+      )
 {
 }
 
@@ -482,7 +494,10 @@ PortableServer::NotAGroupObject::~NotAGroupObject (void)
 
 // Copy constructor.
 PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -503,7 +518,7 @@ void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_point
 PortableServer::NotAGroupObject *
 PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NotAGroupObject *, exc);
     }
@@ -3663,7 +3678,10 @@ const char* PortableServer::POAManager::_interface_repository_id (void) const
 
 // Default constructor.
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0",
+        "AdapterInactive"
+      )
 {
 }
 
@@ -3674,7 +3692,10 @@ PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
 
 // Copy constructor.
 PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -3689,7 +3710,7 @@ PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::
 PortableServer::POAManager::AdapterInactive *
 PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (AdapterInactive *, exc);
     }
@@ -5273,7 +5294,10 @@ const char* PortableServer::POA::_interface_repository_id (void) const
 
 // Default constructor.
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0",
+        "AdapterAlreadyExists"
+      )
 {
 }
 
@@ -5284,7 +5308,10 @@ PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
 
 // Copy constructor.
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5299,7 +5326,7 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO
 PortableServer::POA::AdapterAlreadyExists *
 PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (AdapterAlreadyExists *, exc);
     }
@@ -5351,7 +5378,10 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0",
+        "AdapterNonExistent"
+      )
 {
 }
 
@@ -5362,7 +5392,10 @@ PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
 
 // Copy constructor.
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5377,7 +5410,7 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA:
 PortableServer::POA::AdapterNonExistent *
 PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (AdapterNonExistent *, exc);
     }
@@ -5429,7 +5462,10 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
+        "InvalidPolicy"
+      )
 {
 }
 
@@ -5440,7 +5476,10 @@ PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
 
 // Copy constructor.
 PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->index = _tao_excp.index;
 }
@@ -5457,7 +5496,7 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva
 PortableServer::POA::InvalidPolicy *
 PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidPolicy *, exc);
     }
@@ -5510,7 +5549,10 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (
 PortableServer::POA::InvalidPolicy::InvalidPolicy (
     CORBA::UShort _tao_index
   )
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
+        "InvalidPolicy"
+      )
 {
   this->index = _tao_index;
 }
@@ -5519,7 +5561,10 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (
 
 // Default constructor.
 PortableServer::POA::NoServant::NoServant (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/NoServant:1.0",
+        "NoServant"
+      )
 {
 }
 
@@ -5530,7 +5575,10 @@ PortableServer::POA::NoServant::~NoServant (void)
 
 // Copy constructor.
 PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5545,7 +5593,7 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan
 PortableServer::POA::NoServant *
 PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NoServant *, exc);
     }
@@ -5599,7 +5647,10 @@ void PortableServer::POA::NoServant::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0",
+        "ObjectAlreadyActive"
+      )
 {
 }
 
@@ -5610,7 +5661,10 @@ PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
 
 // Copy constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5625,7 +5679,7 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA
 PortableServer::POA::ObjectAlreadyActive *
 PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (ObjectAlreadyActive *, exc);
     }
@@ -5677,7 +5731,10 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0",
+        "ObjectNotActive"
+      )
 {
 }
 
@@ -5688,7 +5745,10 @@ PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
 
 // Copy constructor.
 PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5703,7 +5763,7 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob
 PortableServer::POA::ObjectNotActive *
 PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (ObjectNotActive *, exc);
     }
@@ -5755,7 +5815,10 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0",
+        "ServantAlreadyActive"
+      )
 {
 }
 
@@ -5766,7 +5829,10 @@ PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
 
 // Copy constructor.
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5781,7 +5847,7 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO
 PortableServer::POA::ServantAlreadyActive *
 PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (ServantAlreadyActive *, exc);
     }
@@ -5833,7 +5899,10 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/ServantNotActive:1.0",
+        "ServantNotActive"
+      )
 {
 }
 
@@ -5844,7 +5913,10 @@ PortableServer::POA::ServantNotActive::~ServantNotActive (void)
 
 // Copy constructor.
 PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5859,7 +5931,7 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S
 PortableServer::POA::ServantNotActive *
 PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (ServantNotActive *, exc);
     }
@@ -5911,7 +5983,10 @@ void PortableServer::POA::ServantNotActive::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/WrongAdapter:1.0",
+        "WrongAdapter"
+      )
 {
 }
 
@@ -5922,7 +5997,10 @@ PortableServer::POA::WrongAdapter::~WrongAdapter (void)
 
 // Copy constructor.
 PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5937,7 +6015,7 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong
 PortableServer::POA::WrongAdapter *
 PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (WrongAdapter *, exc);
     }
@@ -5989,7 +6067,10 @@ void PortableServer::POA::WrongAdapter::_tao_decode (
 
 // Default constructor.
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/WrongPolicy:1.0",
+        "WrongPolicy"
+      )
 {
 }
 
@@ -6000,7 +6081,10 @@ PortableServer::POA::WrongPolicy::~WrongPolicy (void)
 
 // Copy constructor.
 PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -6015,7 +6099,7 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP
 PortableServer::POA::WrongPolicy *
 PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (WrongPolicy *, exc);
     }
@@ -6380,7 +6464,10 @@ const char* PortableServer::Current::_interface_repository_id (void) const
 
 // Default constructor.
 PortableServer::Current::NoContext::NoContext (void)
-  : CORBA_UserException ("IDL:omg.org/PortableServer/Current/NoContext:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/Current/NoContext:1.0",
+        "NoContext"
+      )
 {
 }
 
@@ -6391,7 +6478,10 @@ PortableServer::Current::NoContext::~NoContext (void)
 
 // Copy constructor.
 PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -6406,7 +6496,7 @@ PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::
 PortableServer::Current::NoContext *
 PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NoContext *, exc);
     }
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index 81b49a194b4..d471a191885 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -1203,7 +1203,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
   {
     // now marshal the members (if any)
     if (
@@ -1235,7 +1235,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 982dac4f5d8..d507b3aeaa4 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -5207,7 +5207,10 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const
 
 // Default constructor.
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
-  : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
+        "MutexNotFound"
+      )
 {
 }
 
@@ -5218,7 +5221,10 @@ RTCORBA::RTORB::MutexNotFound::~MutexNotFound (void)
 
 // Copy constructor.
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5233,7 +5239,7 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound
 RTCORBA::RTORB::MutexNotFound *
 RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (MutexNotFound *, exc);
     }
@@ -5285,7 +5291,10 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
 
 // Default constructor.
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
-  : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
+        "InvalidThreadpool"
+      )
 {
 }
 
@@ -5296,7 +5305,10 @@ RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void)
 
 // Copy constructor.
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -5311,7 +5323,7 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr
 RTCORBA::RTORB::InvalidThreadpool *
 RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidThreadpool *, exc);
     }