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

54 files changed, 767 insertions, 978 deletions

diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 980b311f802..9f60eca40f4 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -88,7 +88,7 @@ TAO::Unknown_IDL_Type::value (void) const
 void
 TAO::Unknown_IDL_Type::free_value (void)
 {
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
 }
 
 TAO_InputCDR &
@@ -227,17 +227,20 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
           return 0;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_value (this->cdr_, val);
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -274,17 +277,20 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
           return 0;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_abstract_base (this->cdr_,
                                                obj);
     }
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
index bfead3de02d..0cf77cec3bc 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k)
-  : CORBA::TypeCode (k)
+  : ::CORBA::TypeCode (k)
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
index dc8d3b6631a..64c14e65f51 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
@@ -13,7 +13,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum (
   char const * name,
   EnumeratorArrayType const & enumerators,
   CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
+  : ::CORBA::TypeCode (CORBA::tk_enum)
   , RefCountPolicy ()
   , base_attributes_ (id, name)
   , nenumerators_ (nenumerators)
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
index b0f1e6df742..8d2f31eba9c 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
@@ -13,8 +13,8 @@ TAO::TypeCode::Enum<char const *,
   char const * name,
   char const * const * enumerators,
   CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (CORBA::tk_enum)
+  , ::TAO::Null_RefCount_Policy ()
   , base_attributes_ (id, name)
   , nenumerators_ (nenumerators)
   , enumerators_ (enumerators)
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
index 61aad41d671..62f3e63aac5 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
@@ -8,7 +8,7 @@ template <class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
                                              CORBA::UShort scale)
-  : CORBA::TypeCode (CORBA::tk_fixed)
+  : ::CORBA::TypeCode (CORBA::tk_fixed)
   , RefCountPolicy ()
   , digits_ (digits)
   , scale_ (scale)
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index 36a8721fa7d..c28d735795a 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -1239,17 +1239,21 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
           return TAO::TRAVERSE_STOP;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = src->orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
+
       if (value_tag == 0) // Null value type pointer.
         {
           //We are done.
diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp
index dcad0cb9c3f..a508b7c8f89 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -964,17 +964,21 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
           return TAO::TRAVERSE_STOP;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = stream->orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
+
       if (value_tag == 0) // Null value type pointer.
         {
           //We are done.
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index a2cf1ceafe1..7fa1a03f257 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -48,7 +48,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
 
   CSD_Framework::Strategy_var strategy = repo->find (name);
 
-  if (! CORBA::is_nil (strategy.in ()))
+  if (! ::CORBA::is_nil (strategy.in ()))
     {
       poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
index e4899682ad2..b69086bef7b 100644
--- a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
@@ -63,7 +63,7 @@ TAO::Objref_Traits<CSD_Framework::Strategy>::release (
     CSD_Framework::Strategy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CSD_Framework::Strategy_ptr
@@ -112,18 +112,18 @@ CSD_Framework::Strategy::_unchecked_narrow (
 CSD_Framework::Strategy_ptr
 CSD_Framework::Strategy::_duplicate (Strategy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CSD_Framework::Strategy::_tao_release (Strategy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -184,7 +184,7 @@ TAO::Objref_Traits<CSD_Framework::POA>::release (
     CSD_Framework::POA_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CSD_Framework::POA_ptr
@@ -233,18 +233,18 @@ CSD_Framework::POA::_unchecked_narrow (
 CSD_Framework::POA_ptr
 CSD_Framework::POA::_duplicate (POA_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CSD_Framework::POA::_tao_release (POA_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index fb4d9c69869..cd63c5d7375 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -96,7 +96,7 @@ TAO_CSD_POA::new_POA (const String &name,
 
   CSD_Framework::Strategy_var strategy = repo->find (name);
 
-  if (! CORBA::is_nil (strategy.in ()))
+  if (! ::CORBA::is_nil (strategy.in ()))
     {
       poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -115,7 +115,7 @@ void TAO_CSD_POA::poa_deactivated_hook ()
   this->sds_proxy_->poa_deactivated_event ();
 }
 
-void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant, 
+void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant,
                                const PortableServer::ObjectId& oid
                                ACE_ENV_ARG_DECL)
 {
@@ -123,7 +123,7 @@ void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant,
   ACE_CHECK;
 }
 
-void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant, 
+void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant,
                                  const PortableServer::ObjectId& oid
                                  ACE_ENV_ARG_DECL)
 {
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 0ddb61243f5..526509e6223 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -66,7 +66,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::release (
     DynamicAny::DynAny_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynAny_ptr
@@ -84,7 +84,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
@@ -110,7 +110,7 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::Inva
 DynamicAny::DynAny::InvalidValue&
 DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -168,7 +168,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
@@ -194,7 +194,7 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::Type
 DynamicAny::DynAny::TypeMismatch&
 DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -268,10 +268,10 @@ DynamicAny::DynAny::_narrow (
     {
       return DynAny::_nil ();
     }
-  
+
   DynAny_ptr proxy =
     dynamic_cast<DynAny_ptr> (_tao_objref);
-  
+
   return DynAny::_duplicate (proxy);
 }
 
@@ -285,28 +285,28 @@ DynamicAny::DynAny::_unchecked_narrow (
     {
       return DynAny::_nil ();
     }
-  
+
   DynAny_ptr proxy =
     dynamic_cast<DynAny_ptr> (_tao_objref);
-  
+
   return DynAny::_duplicate (proxy);
 }
 
 DynamicAny::DynAny_ptr
 DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynAny::_tao_release (DynAny_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -367,7 +367,7 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::release (
     DynamicAny::DynFixed_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynFixed_ptr
@@ -401,10 +401,10 @@ DynamicAny::DynFixed::_narrow (
     {
       return DynFixed::_nil ();
     }
-  
+
   DynFixed_ptr proxy =
     dynamic_cast<DynFixed_ptr> (_tao_objref);
-  
+
   return DynFixed::_duplicate (proxy);
 }
 
@@ -418,28 +418,28 @@ DynamicAny::DynFixed::_unchecked_narrow (
     {
       return DynFixed::_nil ();
     }
-  
+
   DynFixed_ptr proxy =
     dynamic_cast<DynFixed_ptr> (_tao_objref);
-  
+
   return DynFixed::_duplicate (proxy);
 }
 
 DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynFixed::_tao_release (DynFixed_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -504,7 +504,7 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::release (
     DynamicAny::DynEnum_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynEnum_ptr
@@ -538,10 +538,10 @@ DynamicAny::DynEnum::_narrow (
     {
       return DynEnum::_nil ();
     }
-  
+
   DynEnum_ptr proxy =
     dynamic_cast<DynEnum_ptr> (_tao_objref);
-  
+
   return DynEnum::_duplicate (proxy);
 }
 
@@ -555,28 +555,28 @@ DynamicAny::DynEnum::_unchecked_narrow (
     {
       return DynEnum::_nil ();
     }
-  
+
   DynEnum_ptr proxy =
     dynamic_cast<DynEnum_ptr> (_tao_objref);
-  
+
   return DynEnum::_duplicate (proxy);
 }
 
 DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynEnum::_tao_release (DynEnum_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -623,12 +623,12 @@ DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
@@ -640,7 +640,7 @@ DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
 DynamicAny::NameValuePairSeq::NameValuePairSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameValuePair
       >
     (max)
@@ -652,7 +652,7 @@ DynamicAny::NameValuePairSeq::NameValuePairSeq (
     DynamicAny::NameValuePair * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameValuePair
       >
     (max, length, buffer, release)
@@ -661,7 +661,7 @@ DynamicAny::NameValuePairSeq::NameValuePairSeq (
 DynamicAny::NameValuePairSeq::NameValuePairSeq (
     const NameValuePairSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameValuePair
       >
     (seq)
@@ -672,12 +672,12 @@ DynamicAny::NameValuePairSeq::~NameValuePairSeq (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
@@ -689,7 +689,7 @@ DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameDynAnyPair
       >
     (max)
@@ -701,7 +701,7 @@ DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     DynamicAny::NameDynAnyPair * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameDynAnyPair
       >
     (max, length, buffer, release)
@@ -710,7 +710,7 @@ DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     const NameDynAnyPairSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameDynAnyPair
       >
     (seq)
@@ -739,7 +739,7 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::release (
     DynamicAny::DynStruct_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynStruct_ptr
@@ -773,10 +773,10 @@ DynamicAny::DynStruct::_narrow (
     {
       return DynStruct::_nil ();
     }
-  
+
   DynStruct_ptr proxy =
     dynamic_cast<DynStruct_ptr> (_tao_objref);
-  
+
   return DynStruct::_duplicate (proxy);
 }
 
@@ -790,28 +790,28 @@ DynamicAny::DynStruct::_unchecked_narrow (
     {
       return DynStruct::_nil ();
     }
-  
+
   DynStruct_ptr proxy =
     dynamic_cast<DynStruct_ptr> (_tao_objref);
-  
+
   return DynStruct::_duplicate (proxy);
 }
 
 DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynStruct::_tao_release (DynStruct_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -876,7 +876,7 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::release (
     DynamicAny::DynUnion_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynUnion_ptr
@@ -910,10 +910,10 @@ DynamicAny::DynUnion::_narrow (
     {
       return DynUnion::_nil ();
     }
-  
+
   DynUnion_ptr proxy =
     dynamic_cast<DynUnion_ptr> (_tao_objref);
-  
+
   return DynUnion::_duplicate (proxy);
 }
 
@@ -927,28 +927,28 @@ DynamicAny::DynUnion::_unchecked_narrow (
     {
       return DynUnion::_nil ();
     }
-  
+
   DynUnion_ptr proxy =
     dynamic_cast<DynUnion_ptr> (_tao_objref);
-  
+
   return DynUnion::_duplicate (proxy);
 }
 
 DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynUnion::_tao_release (DynUnion_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -995,7 +995,7 @@ DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_ANYSEQ_CS_)
@@ -1007,7 +1007,7 @@ DynamicAny::AnySeq::AnySeq (void)
 DynamicAny::AnySeq::AnySeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (max)
@@ -1019,7 +1019,7 @@ DynamicAny::AnySeq::AnySeq (
     CORBA::Any * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (max, length, buffer, release)
@@ -1028,7 +1028,7 @@ DynamicAny::AnySeq::AnySeq (
 DynamicAny::AnySeq::AnySeq (
     const AnySeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (seq)
@@ -1039,7 +1039,7 @@ DynamicAny::AnySeq::~AnySeq (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
@@ -1051,7 +1051,7 @@ DynamicAny::DynAnySeq::DynAnySeq (void)
 DynamicAny::DynAnySeq::DynAnySeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         DynamicAny::DynAny,
         DynamicAny::DynAny_var
       >
@@ -1064,7 +1064,7 @@ DynamicAny::DynAnySeq::DynAnySeq (
     DynamicAny::DynAny_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         DynamicAny::DynAny,
         DynamicAny::DynAny_var
       >
@@ -1074,7 +1074,7 @@ DynamicAny::DynAnySeq::DynAnySeq (
 DynamicAny::DynAnySeq::DynAnySeq (
     const DynAnySeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         DynamicAny::DynAny,
         DynamicAny::DynAny_var
       >
@@ -1104,7 +1104,7 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::release (
     DynamicAny::DynSequence_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynSequence_ptr
@@ -1138,10 +1138,10 @@ DynamicAny::DynSequence::_narrow (
     {
       return DynSequence::_nil ();
     }
-  
+
   DynSequence_ptr proxy =
     dynamic_cast<DynSequence_ptr> (_tao_objref);
-  
+
   return DynSequence::_duplicate (proxy);
 }
 
@@ -1155,28 +1155,28 @@ DynamicAny::DynSequence::_unchecked_narrow (
     {
       return DynSequence::_nil ();
     }
-  
+
   DynSequence_ptr proxy =
     dynamic_cast<DynSequence_ptr> (_tao_objref);
-  
+
   return DynSequence::_duplicate (proxy);
 }
 
 DynamicAny::DynSequence_ptr
 DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynSequence::_tao_release (DynSequence_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1241,7 +1241,7 @@ TAO::Objref_Traits<DynamicAny::DynArray>::release (
     DynamicAny::DynArray_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynArray_ptr
@@ -1275,10 +1275,10 @@ DynamicAny::DynArray::_narrow (
     {
       return DynArray::_nil ();
     }
-  
+
   DynArray_ptr proxy =
     dynamic_cast<DynArray_ptr> (_tao_objref);
-  
+
   return DynArray::_duplicate (proxy);
 }
 
@@ -1292,28 +1292,28 @@ DynamicAny::DynArray::_unchecked_narrow (
     {
       return DynArray::_nil ();
     }
-  
+
   DynArray_ptr proxy =
     dynamic_cast<DynArray_ptr> (_tao_objref);
-  
+
   return DynArray::_duplicate (proxy);
 }
 
 DynamicAny::DynArray_ptr
 DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynArray::_tao_release (DynArray_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1378,7 +1378,7 @@ TAO::Objref_Traits<DynamicAny::DynValue>::release (
     DynamicAny::DynValue_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynValue_ptr
@@ -1412,10 +1412,10 @@ DynamicAny::DynValue::_narrow (
     {
       return DynValue::_nil ();
     }
-  
+
   DynValue_ptr proxy =
     dynamic_cast<DynValue_ptr> (_tao_objref);
-  
+
   return DynValue::_duplicate (proxy);
 }
 
@@ -1429,28 +1429,28 @@ DynamicAny::DynValue::_unchecked_narrow (
     {
       return DynValue::_nil ();
     }
-  
+
   DynValue_ptr proxy =
     dynamic_cast<DynValue_ptr> (_tao_objref);
-  
+
   return DynValue::_duplicate (proxy);
 }
 
 DynamicAny::DynValue_ptr
 DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynValue::_tao_release (DynValue_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1515,7 +1515,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release (
     DynamicAny::DynAnyFactory_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynAnyFactory_ptr
@@ -1533,7 +1533,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
@@ -1559,7 +1559,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::D
 DynamicAny::DynAnyFactory::InconsistentTypeCode&
 DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1633,10 +1633,10 @@ DynamicAny::DynAnyFactory::_narrow (
     {
       return DynAnyFactory::_nil ();
     }
-  
+
   DynAnyFactory_ptr proxy =
     dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-  
+
   return DynAnyFactory::_duplicate (proxy);
 }
 
@@ -1650,28 +1650,28 @@ DynamicAny::DynAnyFactory::_unchecked_narrow (
     {
       return DynAnyFactory::_nil ();
     }
-  
+
   DynAnyFactory_ptr proxy =
     dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-  
+
   return DynAnyFactory::_duplicate (proxy);
 }
 
 DynamicAny::DynAnyFactory_ptr
 DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynAnyFactory::_tao_release (DynAnyFactory_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1748,22 +1748,7 @@ CORBA::Boolean operator<< (
     const DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -1771,40 +1756,7 @@ CORBA::Boolean operator>> (
     DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_ */
@@ -1820,22 +1772,7 @@ CORBA::Boolean operator<< (
     const DynamicAny::AnySeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -1843,40 +1780,7 @@ CORBA::Boolean operator>> (
     DynamicAny::AnySeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 4aebbe120c5..b3830befdfe 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -1144,7 +1144,7 @@ namespace DynamicAny
     typedef NameValuePair_var _var_type;
 
 
-    TAO_String_Manager id;
+    TAO::String_Manager id;
     CORBA::Any value;
   };
 
@@ -1158,22 +1158,19 @@ namespace DynamicAny
 
   typedef
     TAO_VarSeq_Var_T<
-        NameValuePairSeq,
-        NameValuePair
+        NameValuePairSeq
       >
     NameValuePairSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        NameValuePairSeq,
-        NameValuePairSeq_var,
-        NameValuePair
+        NameValuePairSeq
       >
     NameValuePairSeq_out;
 
   class TAO_DynamicAny_Export NameValuePairSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             NameValuePair
           >
   {
@@ -1184,7 +1181,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         NameValuePair* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
@@ -1220,7 +1217,7 @@ namespace DynamicAny
     typedef NameDynAnyPair_var _var_type;
 
 
-    TAO_String_Manager id;
+    TAO::String_Manager id;
     DynamicAny::DynAny_var value;
   };
 
@@ -1234,22 +1231,19 @@ namespace DynamicAny
 
   typedef
     TAO_VarSeq_Var_T<
-        NameDynAnyPairSeq,
-        NameDynAnyPair
+        NameDynAnyPairSeq
       >
     NameDynAnyPairSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        NameDynAnyPairSeq,
-        NameDynAnyPairSeq_var,
-        NameDynAnyPair
+        NameDynAnyPairSeq
       >
     NameDynAnyPairSeq_out;
 
   class TAO_DynamicAny_Export NameDynAnyPairSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             NameDynAnyPair
           >
   {
@@ -1260,7 +1254,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         NameDynAnyPair* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
@@ -1615,22 +1609,19 @@ namespace DynamicAny
 
   typedef
     TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
+        AnySeq
       >
     AnySeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
+        AnySeq
       >
     AnySeq_out;
 
   class TAO_DynamicAny_Export AnySeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Any
           >
   {
@@ -1641,7 +1632,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::Any* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     AnySeq (const AnySeq &);
     ~AnySeq (void);
@@ -1660,29 +1651,20 @@ namespace DynamicAny
   class DynAnySeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        DynAnySeq,
-        TAO_Object_Manager<
-            DynAny,
-            DynAny_var
-          >
+    TAO_VarSeq_Var_T<
+        DynAnySeq
       >
     DynAnySeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        DynAnySeq,
-        DynAnySeq_var,
-        TAO_Object_Manager<
-            DynAny,
-            DynAny_var
-          >
+    TAO_Seq_Out_T<
+        DynAnySeq
       >
     DynAnySeq_out;
 
   class TAO_DynamicAny_Export DynAnySeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             DynAny,
             DynAny_var
           >
@@ -1694,7 +1676,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         DynAny_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 877d38025ea..42e816c1590 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -45,7 +45,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
     : public
@@ -81,7 +81,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::release (
     PortableInterceptor::IORInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::IORInfo_ptr
@@ -130,18 +130,18 @@ PortableInterceptor::IORInfo::_unchecked_narrow (
 PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::IORInfo::_tao_release (IORInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 684f5361ebc..853aaec6f59 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::IORInterceptor_ptr
@@ -111,18 +111,18 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
 PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::IORInterceptor::_tao_release (IORInterceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -187,7 +187,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::release (
     PortableInterceptor::IORInterceptor_3_0_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::IORInterceptor_3_0_ptr
@@ -236,18 +236,18 @@ PortableInterceptor::IORInterceptor_3_0::_unchecked_narrow (
 PortableInterceptor::IORInterceptor_3_0_ptr
 PortableInterceptor::IORInterceptor_3_0::_duplicate (IORInterceptor_3_0_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::IORInterceptor_3_0::_tao_release (IORInterceptor_3_0_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index d18206701dc..f1792a65da1 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -66,13 +66,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -87,13 +87,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -107,13 +107,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -127,13 +127,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -147,13 +147,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -171,7 +171,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
@@ -197,7 +197,7 @@ ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::Implemen
 ImplementationRepository::AlreadyRegistered&
 ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -253,7 +253,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -266,7 +266,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -290,7 +290,7 @@ static TAO::TypeCode::Struct<char const *,
     "AlreadyRegistered",
     _tao_fields_ImplementationRepository_AlreadyRegistered,
     0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
@@ -299,7 +299,7 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
@@ -326,7 +326,7 @@ ImplementationRepository::CannotActivate::CannotActivate (const ::Implementation
 ImplementationRepository::CannotActivate&
 ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepository::CannotActivate &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->reason = ::CORBA::string_dup (_tao_excp.reason.in ());
   return *this;
 }
@@ -383,7 +383,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -396,7 +396,7 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -428,7 +428,7 @@ ImplementationRepository::CannotActivate::CannotActivate (
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
   {
     { "reason", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -440,7 +440,7 @@ static TAO::TypeCode::Struct<char const *,
     "CannotActivate",
     _tao_fields_ImplementationRepository_CannotActivate,
     1);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_CannotActivate =
@@ -449,7 +449,7 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
@@ -475,7 +475,7 @@ ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::
 ImplementationRepository::NotFound&
 ImplementationRepository::NotFound::operator= (const ::ImplementationRepository::NotFound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -531,7 +531,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -544,7 +544,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -568,7 +568,7 @@ static TAO::TypeCode::Struct<char const *,
     "NotFound",
     _tao_fields_ImplementationRepository_NotFound,
     0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_NotFound =
@@ -584,7 +584,7 @@ static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *>
   {
     { "name", &CORBA::_tc_string },
     { "value", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -596,7 +596,7 @@ static TAO::TypeCode::Struct<char const *,
     "EnvironmentVariable",
     _tao_fields_ImplementationRepository_EnvironmentVariable,
     2);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
@@ -605,10 +605,10 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -618,7 +618,7 @@ ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
@@ -630,7 +630,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (void)
 ImplementationRepository::EnvironmentList::EnvironmentList (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EnvironmentVariable
       >
     (max)
@@ -642,7 +642,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (
     ImplementationRepository::EnvironmentVariable * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EnvironmentVariable
       >
     (max, length, buffer, release)
@@ -651,7 +651,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (
 ImplementationRepository::EnvironmentList::EnvironmentList (
     const EnvironmentList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EnvironmentVariable
       >
     (seq)
@@ -692,10 +692,10 @@ namespace TAO
         ::CORBA::tk_sequence,
         &ImplementationRepository::_tc_EnvironmentVariable,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
       &ImplementationRepository_EnvironmentList_0;
-    
+
   }
 }
 
@@ -710,7 +710,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/EnvironmentList:1.0",
     "EnvironmentList",
     &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
@@ -728,7 +728,7 @@ static char const * const _tao_enumerators_ImplementationRepository_ActivationMo
     "MANUAL",
     "PER_CLIENT",
     "AUTO_START"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -739,7 +739,7 @@ static TAO::TypeCode::Enum<char const *,
     "ActivationMode",
     _tao_enumerators_ImplementationRepository_ActivationMode,
     4);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ActivationMode =
@@ -764,7 +764,7 @@ static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *>
     { "activation", &ImplementationRepository::_tc_ActivationMode },
     { "activator", &CORBA::_tc_string },
     { "start_limit", &CORBA::_tc_long }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -776,7 +776,7 @@ static TAO::TypeCode::Struct<char const *,
     "StartupOptions",
     _tao_fields_ImplementationRepository_StartupOptions,
     6);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_StartupOptions =
@@ -785,10 +785,10 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 ImplementationRepository::StartupOptions::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -806,7 +806,7 @@ static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *>
     { "server", &CORBA::_tc_string },
     { "startup", &ImplementationRepository::_tc_StartupOptions },
     { "partial_ior", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -818,7 +818,7 @@ static TAO::TypeCode::Struct<char const *,
     "ServerInformation",
     _tao_fields_ImplementationRepository_ServerInformation,
     3);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformation =
@@ -827,10 +827,10 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 ImplementationRepository::ServerInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -840,7 +840,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
@@ -852,7 +852,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (void)
 ImplementationRepository::ServerInformationList::ServerInformationList (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServerInformation
       >
     (max)
@@ -864,7 +864,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (
     ImplementationRepository::ServerInformation * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServerInformation
       >
     (max, length, buffer, release)
@@ -873,7 +873,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (
 ImplementationRepository::ServerInformationList::ServerInformationList (
     const ServerInformationList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServerInformation
       >
     (seq)
@@ -914,10 +914,10 @@ namespace TAO
         ::CORBA::tk_sequence,
         &ImplementationRepository::_tc_ServerInformation,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
       &ImplementationRepository_ServerInformationList_0;
-    
+
   }
 }
 
@@ -932,7 +932,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/ServerInformationList:1.0",
     "ServerInformationList",
     &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
@@ -959,7 +959,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -978,7 +978,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -997,25 +997,25 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers (servers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_how_many,
       &_tao_servers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1024,10 +1024,10 @@ TAO::Collocation_Proxy_Broker *
       6,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1043,21 +1043,21 @@ void ImplementationRepository::ServerInformationIterator::destroy (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1066,7 +1066,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
       7,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1090,12 +1090,12 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *_tao_tmp_pointer =
     static_cast<ServerInformationIterator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -1131,18 +1131,18 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
 ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 ImplementationRepository::ServerInformationIterator::_tao_release (ServerInformationIterator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1166,7 +1166,7 @@ ImplementationRepository::ServerInformationIterator::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1193,7 +1193,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerInformationIterator:1.0",
     "ServerInformationIterator");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
@@ -1220,7 +1220,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::release (
     ImplementationRepository::Administration_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 ImplementationRepository::Administration_ptr
@@ -1239,7 +1239,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -1259,25 +1259,25 @@ void ImplementationRepository::Administration::activate_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1286,7 +1286,7 @@ void ImplementationRepository::Administration::activate_server (
         , ImplementationRepository::_tc_NotFound
 #endif /* TAO_HAS_INTERCEPTORS */
       },
-      
+
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc
@@ -1295,7 +1295,7 @@ void ImplementationRepository::Administration::activate_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1304,7 +1304,7 @@ void ImplementationRepository::Administration::activate_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
       2
@@ -1328,27 +1328,27 @@ void ImplementationRepository::Administration::add_or_update_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1358,7 +1358,7 @@ void ImplementationRepository::Administration::add_or_update_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1367,7 +1367,7 @@ void ImplementationRepository::Administration::add_or_update_server (
       20,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata,
       1
@@ -1390,25 +1390,25 @@ void ImplementationRepository::Administration::remove_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1418,7 +1418,7 @@ void ImplementationRepository::Administration::remove_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1427,7 +1427,7 @@ void ImplementationRepository::Administration::remove_server (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
       1
@@ -1450,25 +1450,25 @@ void ImplementationRepository::Administration::shutdown_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1478,7 +1478,7 @@ void ImplementationRepository::Administration::shutdown_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1487,7 +1487,7 @@ void ImplementationRepository::Administration::shutdown_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
       1
@@ -1512,19 +1512,19 @@ void ImplementationRepository::Administration::server_is_running (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior (partial_ior);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1532,9 +1532,9 @@ void ImplementationRepository::Administration::server_is_running (
       &_tao_partial_ior,
       &_tao_server_object
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1544,7 +1544,7 @@ void ImplementationRepository::Administration::server_is_running (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1553,7 +1553,7 @@ void ImplementationRepository::Administration::server_is_running (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
       1
@@ -1576,25 +1576,25 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1604,7 +1604,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1613,7 +1613,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
       23,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
       1
@@ -1636,25 +1636,25 @@ void ImplementationRepository::Administration::find (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_info
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1663,7 +1663,7 @@ void ImplementationRepository::Administration::find (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1683,19 +1683,19 @@ void ImplementationRepository::Administration::list (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1703,7 +1703,7 @@ void ImplementationRepository::Administration::list (
       &_tao_server_list,
       &_tao_server_iterator
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1712,7 +1712,7 @@ void ImplementationRepository::Administration::list (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1731,25 +1731,25 @@ void ImplementationRepository::Administration::shutdown (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators (activators);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers (servers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_activators,
       &_tao_servers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1759,7 +1759,7 @@ void ImplementationRepository::Administration::shutdown (
       this->the_TAO_Administration_Proxy_Broker_,
       TAO::TAO_ONEWAY_INVOCATION
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1783,12 +1783,12 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void 
+void
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *_tao_tmp_pointer =
     static_cast<Administration *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::Administration_ptr
@@ -1824,18 +1824,18 @@ ImplementationRepository::Administration::_unchecked_narrow (
 ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 ImplementationRepository::Administration::_tao_release (Administration_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1859,7 +1859,7 @@ ImplementationRepository::Administration::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1886,7 +1886,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:ImplementationRepository/Administration:1.0",
     "Administration");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_Administration =
@@ -1895,7 +1895,7 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -1907,12 +1907,12 @@ namespace TAO
     )
   {
     ::CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -1923,7 +1923,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -1983,7 +1983,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -1995,12 +1995,12 @@ namespace TAO
     )
   {
     ::CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -2011,7 +2011,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -2071,7 +2071,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -2083,12 +2083,12 @@ namespace TAO
     )
   {
     ::CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -2099,7 +2099,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -2159,7 +2159,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2217,7 +2217,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -2300,11 +2300,11 @@ void operator<<= (
     TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
         _tao_any,
         ImplementationRepository::_tc_ActivationMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2362,7 +2362,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2420,7 +2420,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -2499,8 +2499,8 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -2512,7 +2512,7 @@ namespace ImplementationRepository
       ServerInformationIterator::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -2527,7 +2527,7 @@ namespace ImplementationRepository
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -2611,8 +2611,8 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -2624,7 +2624,7 @@ namespace ImplementationRepository
       Administration::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -2639,7 +2639,7 @@ namespace ImplementationRepository
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -2810,22 +2810,7 @@ operator>>= (
     const ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -2833,40 +2818,7 @@ operator>>= (
     ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
@@ -2883,12 +2835,12 @@ operator>>= (
 {
   ::CORBA::ULong _tao_temp = 0;
   ::CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<ImplementationRepository::ActivationMode> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -2959,22 +2911,7 @@ operator>>= (
     const ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -2982,40 +2919,7 @@ operator>>= (
     ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
@@ -3038,21 +2942,21 @@ operator>>= (
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -3074,21 +2978,21 @@ operator>>= (
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
index b683f485825..2c2b4bd4478 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.h
+++ b/TAO/tao/ImR_Client/ImplRepoC.h
@@ -62,7 +62,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -76,30 +76,30 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-  
+
   class TAO_IMR_Client_Export AlreadyRegistered : public ::CORBA::UserException
   {
   public:
-    
+
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static AlreadyRegistered *_downcast ( ::CORBA::Exception *);
     static const AlreadyRegistered *_downcast ( ::CORBA::Exception const *);
-    
+
     static ::CORBA::Exception *_alloc (void);
-    
+
     virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -108,46 +108,46 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-  
+
   class TAO_IMR_Client_Export CannotActivate : public ::CORBA::UserException
   {
   public:
-    
-    TAO_String_Manager reason;
+
+    TAO::String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static CannotActivate *_downcast ( ::CORBA::Exception *);
     static const CannotActivate *_downcast ( ::CORBA::Exception const *);
-    
+
     static ::CORBA::Exception *_alloc (void);
-    
+
     virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -156,52 +156,52 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     CannotActivate (
         const char * _tao_reason
       );
-    
+
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-  
+
   class TAO_IMR_Client_Export NotFound : public ::CORBA::UserException
   {
   public:
-    
+
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static NotFound *_downcast ( ::CORBA::Exception *);
     static const NotFound *_downcast ( ::CORBA::Exception const *);
-    
+
     static ::CORBA::Exception *_alloc (void);
-    
+
     virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -210,83 +210,80 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct EnvironmentVariable;
-  
+
   typedef
     TAO_Var_Var_T<
         EnvironmentVariable
       >
     EnvironmentVariable_var;
-  
+
   typedef
     TAO_Out_T<
         EnvironmentVariable,
         EnvironmentVariable_var
       >
     EnvironmentVariable_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IMR_Client_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager value;
+    TAO::String_Manager name;
+    TAO::String_Manager value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-  
+
   class EnvironmentList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        EnvironmentList,
-        EnvironmentVariable
+        EnvironmentList
       >
     EnvironmentList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        EnvironmentList,
-        EnvironmentList_var,
-        EnvironmentVariable
+        EnvironmentList
       >
     EnvironmentList_out;
-  
+
   class TAO_IMR_Client_Export EnvironmentList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             EnvironmentVariable
           >
   {
@@ -296,27 +293,27 @@ namespace ImplementationRepository
     EnvironmentList (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        EnvironmentVariable* buffer, 
-        ::CORBA::Boolean release = 0
+        EnvironmentVariable* buffer,
+        ::CORBA::Boolean release = false
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef EnvironmentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ActivationMode
   {
     NORMAL,
@@ -324,115 +321,112 @@ namespace ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-  
+
   typedef ActivationMode &ActivationMode_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct StartupOptions;
-  
+
   typedef
     TAO_Var_Var_T<
         StartupOptions
       >
     StartupOptions_var;
-  
+
   typedef
     TAO_Out_T<
         StartupOptions,
         StartupOptions_var
       >
     StartupOptions_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IMR_Client_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager command_line;
+    TAO::String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
-    TAO_String_Manager working_directory;
+    TAO::String_Manager working_directory;
     ImplementationRepository::ActivationMode activation;
-    TAO_String_Manager activator;
+    TAO::String_Manager activator;
     ::CORBA::Long start_limit;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ServerInformation;
-  
+
   typedef
     TAO_Var_Var_T<
         ServerInformation
       >
     ServerInformation_var;
-  
+
   typedef
     TAO_Out_T<
         ServerInformation,
         ServerInformation_var
       >
     ServerInformation_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IMR_Client_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager server;
+    TAO::String_Manager server;
     ImplementationRepository::StartupOptions startup;
-    TAO_String_Manager partial_ior;
+    TAO::String_Manager partial_ior;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-  
+
   class ServerInformationList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ServerInformationList,
-        ServerInformation
+        ServerInformationList
       >
     ServerInformationList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ServerInformationList,
-        ServerInformationList_var,
-        ServerInformation
+        ServerInformationList
       >
     ServerInformationList_out;
-  
+
   class TAO_IMR_Client_Export ServerInformationList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ServerInformation
           >
   {
@@ -442,39 +436,39 @@ namespace ImplementationRepository
     ServerInformationList (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ServerInformation* buffer, 
-        ::CORBA::Boolean release = 0
+        ServerInformation* buffer,
+        ::CORBA::Boolean release = false
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ServerInformationList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
-  
+
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServerInformationIterator
       >
     ServerInformationIterator_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServerInformationIterator
@@ -482,13 +476,13 @@ namespace ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-  
+
   class TAO_IMR_Client_Export ServerInformationIterator
     : public virtual ::CORBA::Object
   {
@@ -496,32 +490,32 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<ServerInformationIterator>;
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
-    
+
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-    
+
     static void _tao_release (ServerInformationIterator_ptr obj);
-    
+
     static ServerInformationIterator_ptr _narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerInformationIterator_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerInformationIterator_ptr _nil (void)
     {
       return static_cast<ServerInformationIterator_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out servers
@@ -530,44 +524,44 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ServerInformationIterator (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ServerInformationIterator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ServerInformationIterator (
         TAO_Stub *objref,
@@ -575,38 +569,38 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ServerInformationIterator (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerInformationIterator (const ServerInformationIterator &);
-    
+
     void operator= (const ServerInformationIterator &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
-  
+
   class Administration;
   typedef Administration *Administration_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Administration
       >
     Administration_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Administration
@@ -614,13 +608,13 @@ namespace ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-  
+
   class TAO_IMR_Client_Export Administration
     : public virtual ::CORBA::Object
   {
@@ -628,32 +622,32 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<Administration>;
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
-    
+
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-    
+
     static void _tao_release (Administration_ptr obj);
-    
+
     static Administration_ptr _narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Administration_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Administration_ptr _nil (void)
     {
       return static_cast<Administration_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -663,10 +657,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_or_update_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -676,10 +670,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -688,10 +682,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -700,10 +694,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void server_is_running (
         const char * server,
         const char * partial_ior,
@@ -714,10 +708,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -726,10 +720,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
@@ -738,10 +732,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -751,10 +745,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void shutdown (
         ::CORBA::Boolean activators,
         ::CORBA::Boolean servers
@@ -763,34 +757,34 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Administration (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Administration (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Administration (
         TAO_Stub *objref,
@@ -798,21 +792,21 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Administration (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Administration (const Administration &);
-    
+
     void operator= (const Administration &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
 
 // TAO_IDL - Generated from
@@ -846,7 +840,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_
-  
+
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
   {
@@ -867,7 +861,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_
-  
+
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::Administration>
   {
diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl
index ca194cdf453..622ec12097e 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.inl
+++ b/TAO/tao/ImR_Client/ImplRepoC.inl
@@ -41,7 +41,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -57,7 +57,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
 {
 }
@@ -77,7 +77,7 @@ ImplementationRepository::Administration::Administration (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -93,7 +93,7 @@ ImplementationRepository::Administration::Administration (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Administration_Proxy_Broker_ (0)
 {
 }
diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp
index 1d4d4afce68..dd319af924a 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectC.cpp
@@ -76,7 +76,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
     ImplementationRepository::ServerObject_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 ImplementationRepository::ServerObject_ptr
@@ -95,7 +95,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -112,21 +112,21 @@ void ImplementationRepository::ServerObject::ping (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -135,7 +135,7 @@ void ImplementationRepository::ServerObject::ping (
       4,
       this->the_TAO_ServerObject_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -152,21 +152,21 @@ void ImplementationRepository::ServerObject::shutdown (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -176,7 +176,7 @@ void ImplementationRepository::ServerObject::shutdown (
       this->the_TAO_ServerObject_Proxy_Broker_,
       TAO::TAO_ONEWAY_INVOCATION
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -200,12 +200,12 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
 ImplementationRepository::ServerObject::~ServerObject (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerObject *_tao_tmp_pointer =
     static_cast<ServerObject *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::ServerObject_ptr
@@ -241,18 +241,18 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
 ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 ImplementationRepository::ServerObject::_tao_release (ServerObject_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -276,7 +276,7 @@ ImplementationRepository::ServerObject::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -303,7 +303,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerObject:1.0",
     "ServerObject");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerObject =
@@ -332,8 +332,8 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -345,7 +345,7 @@ namespace ImplementationRepository
       ServerObject::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -360,7 +360,7 @@ namespace ImplementationRepository
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -442,21 +442,21 @@ operator>>= (
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
diff --git a/TAO/tao/ImR_Client/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl
index 5582a055944..28ca1902482 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.inl
+++ b/TAO/tao/ImR_Client/ServerObjectC.inl
@@ -40,7 +40,7 @@ ImplementationRepository::ServerObject::ServerObject (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -56,7 +56,7 @@ ImplementationRepository::ServerObject::ServerObject (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ServerObject_Proxy_Broker_ (0)
 {
 }
diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
index eda71934918..969f8adfde2 100644
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ b/TAO/tao/PI/ClientRequestDetails.cpp
@@ -26,7 +26,7 @@ namespace TAO
 
     for (CORBA::ULong i = 0; i < plen; ++i)
       {
-        CORBA::Policy_var policy = policies[i];
+        CORBA::Policy_var policy = CORBA::Policy::_duplicate (policies[i]);
 
         if (CORBA::is_nil (policy.in ()))
           {
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 9a0baa762bf..c4b7b6ec8de 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -546,8 +546,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
             this->invocation_->operation_details ().ex_data ()[i].tc_ptr;
           if (!CORBA::is_nil (tcp))
             {
-              TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-              exception_list[i] = tcp_object;
+              exception_list[i] = tcp;
             }
         }
     }
diff --git a/TAO/tao/PI/ClientRequestInfoC.cpp b/TAO/tao/PI/ClientRequestInfoC.cpp
index 007536ecfe1..8c9be367b0f 100644
--- a/TAO/tao/PI/ClientRequestInfoC.cpp
+++ b/TAO/tao/PI/ClientRequestInfoC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
     PortableInterceptor::ClientRequestInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
@@ -111,18 +111,18 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI/ClientRequestInterceptorC.cpp b/TAO/tao/PI/ClientRequestInterceptorC.cpp
index 970c1ea6d1b..18721ae0d0f 100644
--- a/TAO/tao/PI/ClientRequestInterceptorC.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release (
     PortableInterceptor::ClientRequestInterceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
@@ -111,18 +111,18 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestInterceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ClientRequestInterceptor::_tao_release (ClientRequestInterceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI/InterceptorC.cpp b/TAO/tao/PI/InterceptorC.cpp
index d7f673c3dfb..bcb672a9d2b 100644
--- a/TAO/tao/PI/InterceptorC.cpp
+++ b/TAO/tao/PI/InterceptorC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::release (
     PortableInterceptor::Interceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::Interceptor_ptr
@@ -111,18 +111,18 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::Interceptor::_tao_release (Interceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp
index e70f2b68fb2..8d01da855f3 100644
--- a/TAO/tao/PI/InvalidSlotC.cpp
+++ b/TAO/tao/PI/InvalidSlotC.cpp
@@ -75,7 +75,7 @@ PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::Inva
 PortableInterceptor::InvalidSlot&
 PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 0677994dc3e..23ec50a3dae 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -41,7 +41,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (
     TAO_ORBInitInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO_ORBInitInfo_ptr
diff --git a/TAO/tao/PI/ORBInitInfoC.cpp b/TAO/tao/PI/ORBInitInfoC.cpp
index 6fee3193261..6de6e4ccb75 100644
--- a/TAO/tao/PI/ORBInitInfoC.cpp
+++ b/TAO/tao/PI/ORBInitInfoC.cpp
@@ -74,7 +74,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
     PortableInterceptor::ORBInitInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ORBInitInfo_ptr
@@ -134,7 +134,7 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::Portable
 PortableInterceptor::ORBInitInfo::DuplicateName&
 PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->name = ::CORBA::string_dup (_tao_excp.name.in ());
   return *this;
 }
@@ -268,7 +268,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInte
 PortableInterceptor::ORBInitInfo::InvalidName&
 PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -386,7 +386,7 @@ PortableInterceptor::ORBInitInfo::_unchecked_narrow (
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -397,7 +397,7 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
 void
 PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -476,7 +476,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::release (
     PortableInterceptor::ORBInitInfo_3_1_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ORBInitInfo_3_1_ptr
@@ -525,7 +525,7 @@ PortableInterceptor::ORBInitInfo_3_1::_unchecked_narrow (
 PortableInterceptor::ORBInitInfo_3_1_ptr
 PortableInterceptor::ORBInitInfo_3_1::_duplicate (ORBInitInfo_3_1_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -536,7 +536,7 @@ PortableInterceptor::ORBInitInfo_3_1::_duplicate (ORBInitInfo_3_1_ptr obj)
 void
 PortableInterceptor::ORBInitInfo_3_1::_tao_release (ORBInitInfo_3_1_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI/ORBInitInfoC.h b/TAO/tao/PI/ORBInitInfoC.h
index 7ba6d29d08a..647e2eeda08 100644
--- a/TAO/tao/PI/ORBInitInfoC.h
+++ b/TAO/tao/PI/ORBInitInfoC.h
@@ -46,7 +46,6 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/Managed_Types.h"
 #include "tao/AnyTypeCode/StringSeqA.h"
 #include "tao/CodecFactory/IOP_Codec_includeA.h"
 #include "tao/AnyTypeCode/PI_ForwardA.h"
@@ -246,7 +245,7 @@ namespace PortableInterceptor
     {
     public:
 
-      TAO_String_Manager name;
+      TAO::String_Manager name;
       DuplicateName (void);
       DuplicateName (const DuplicateName &);
       ~DuplicateName (void);
diff --git a/TAO/tao/PI/ORBInitializerC.cpp b/TAO/tao/PI/ORBInitializerC.cpp
index 28476830769..bd719da92ee 100644
--- a/TAO/tao/PI/ORBInitializerC.cpp
+++ b/TAO/tao/PI/ORBInitializerC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
     PortableInterceptor::ORBInitializer_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ORBInitializer_ptr
@@ -111,18 +111,18 @@ PortableInterceptor::ORBInitializer::_unchecked_narrow (
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI/PICurrentC.cpp b/TAO/tao/PI/PICurrentC.cpp
index 79c119255e9..b96a906c176 100644
--- a/TAO/tao/PI/PICurrentC.cpp
+++ b/TAO/tao/PI/PICurrentC.cpp
@@ -66,7 +66,7 @@ TAO::Objref_Traits<PortableInterceptor::Current>::release (
     PortableInterceptor::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::Current_ptr
@@ -90,12 +90,12 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-void 
+void
 PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
     static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 PortableInterceptor::Current_ptr
@@ -123,18 +123,18 @@ PortableInterceptor::Current::_unchecked_narrow (
 PortableInterceptor::Current_ptr
 PortableInterceptor::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp
index 4ed08fabe20..5431e9d88b3 100644
--- a/TAO/tao/PI/PIForwardRequestC.cpp
+++ b/TAO/tao/PI/PIForwardRequestC.cpp
@@ -45,7 +45,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
@@ -72,7 +72,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor
 PortableInterceptor::ForwardRequest&
 PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
   return *this;
 }
@@ -129,7 +129,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -142,7 +142,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index 49c458fd6be..9c4ed43e4af 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
     PortableInterceptor::PolicyFactory_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::PolicyFactory_ptr
@@ -111,7 +111,7 @@ PortableInterceptor::PolicyFactory::_unchecked_narrow (
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -122,7 +122,7 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
 void
 PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index e97382928c8..f91af3df5da 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -24,7 +24,7 @@ TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
 
   for (TABLE::iterator i = this->factories_.begin (); i != end; ++i)
     {
-      CORBA::release ((*i).int_id_);
+      ::CORBA::release ((*i).int_id_);
     }
 
   this->factories_.close ();
@@ -54,7 +54,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
   if (result != 0)
     {
       // Release the duplicated factory to prevent a memory leak
-      CORBA::release (factory);
+      ::CORBA::release (factory);
 
       if (result == 1)
         {
diff --git a/TAO/tao/PI/ProcessingModePolicyC.cpp b/TAO/tao/PI/ProcessingModePolicyC.cpp
index 56768cef58d..6430acfb8a0 100644
--- a/TAO/tao/PI/ProcessingModePolicyC.cpp
+++ b/TAO/tao/PI/ProcessingModePolicyC.cpp
@@ -63,7 +63,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:PortableInterceptor/ProcessingMode:1.0",
     "ProcessingMode",
     &CORBA::_tc_short);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ProcessingMode =
@@ -90,7 +90,7 @@ TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::release (
     PortableInterceptor::ProcessingModePolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ProcessingModePolicy_ptr
@@ -139,18 +139,18 @@ PortableInterceptor::ProcessingModePolicy::_unchecked_narrow (
 PortableInterceptor::ProcessingModePolicy_ptr
 PortableInterceptor::ProcessingModePolicy::_duplicate (ProcessingModePolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ProcessingModePolicy::_tao_release (ProcessingModePolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -206,7 +206,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:PortableInterceptor/ProcessingModePolicy:1.0",
     "ProcessingModePolicy");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ProcessingModePolicy =
diff --git a/TAO/tao/PI/RequestInfoC.cpp b/TAO/tao/PI/RequestInfoC.cpp
index 5a921808a7c..a3bcb9a2376 100644
--- a/TAO/tao/PI/RequestInfoC.cpp
+++ b/TAO/tao/PI/RequestInfoC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
     PortableInterceptor::RequestInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::RequestInfo_ptr
@@ -111,18 +111,18 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
index 69fcd9ec298..3332d35c2a1 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
@@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
     PortableInterceptor::ServerRequestInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
@@ -112,18 +112,18 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index db1e8a5d4e2..6b2190b9629 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release (
     PortableInterceptor::ServerRequestInterceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -112,18 +112,18 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestInterceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
index 7eb482f2d99..e1f1bc8edac 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
     PortableServer::AdapterActivator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::AdapterActivator_ptr
@@ -113,18 +113,18 @@ PortableServer::AdapterActivator::_unchecked_narrow (
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::AdapterActivator::_tao_release (AdapterActivator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
index d82d2935b9f..42656510bba 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -47,7 +47,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::ForwardRequest::ForwardRequest (void)
@@ -74,7 +74,7 @@ PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardR
 PortableServer::ForwardRequest&
 PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
   return *this;
 }
@@ -131,7 +131,7 @@ void PortableServer::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -144,7 +144,7 @@ void PortableServer::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
index 7d78dc8ac31..309a2c0fcb4 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::IdAssignmentPolicy_ptr
@@ -111,18 +111,18 @@ PortableServer::IdAssignmentPolicy::_unchecked_narrow (
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::IdAssignmentPolicy::_tao_release (IdAssignmentPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,12 +181,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPoli
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::IdAssignmentPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
index 636a02a22c3..a8064c3f8c2 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::IdUniquenessPolicy_ptr
@@ -111,18 +111,18 @@ PortableServer::IdUniquenessPolicy::_unchecked_narrow (
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::IdUniquenessPolicy::_tao_release (IdUniquenessPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,12 +181,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPoli
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::IdUniquenessPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
index 3a6f411acf4..e775416377f 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
@@ -113,18 +113,18 @@ PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ImplicitActivationPolicy::_tao_release (ImplicitActivationPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -183,12 +183,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivati
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::ImplicitActivationPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
index 6e819d2f343..050481e60d5 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -62,7 +62,7 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
     PortableServer::LifespanPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::LifespanPolicy_ptr
@@ -111,18 +111,18 @@ PortableServer::LifespanPolicy::_unchecked_narrow (
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::LifespanPolicy::_tao_release (LifespanPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,12 +181,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyVa
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::LifespanPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
index 3c397bb99a2..dde8fc49b7b 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -73,7 +73,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::release (
     PortableServer::POAManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::POAManager_ptr
@@ -91,7 +91,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
@@ -117,7 +117,7 @@ PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableSe
 PortableServer::POAManager::AdapterInactive&
 PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -200,7 +200,7 @@ static TAO::TypeCode::Struct<char const *,
     "AdapterInactive",
     _tao_fields_PortableServer_POAManager_AdapterInactive,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
   &_tao_tc_PortableServer_POAManager_AdapterInactive;
 
@@ -213,7 +213,7 @@ static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
     "ACTIVE",
     "DISCARDING",
     "INACTIVE"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -224,7 +224,7 @@ static TAO::TypeCode::Enum<char const *,
     "State",
     _tao_enumerators_PortableServer_POAManager_State,
     4);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
   &_tao_tc_PortableServer_POAManager_State;
 
@@ -259,18 +259,18 @@ PortableServer::POAManager::_unchecked_narrow (
 PortableServer::POAManager_ptr
 PortableServer::POAManager::_duplicate (POAManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::POAManager::_tao_release (POAManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -322,7 +322,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/POAManager:2.3",
     "POAManager");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POAManager =
diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp
index 1f0d5f29e69..e32c4f50884 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentC.cpp
@@ -71,7 +71,7 @@ TAO::Objref_Traits<PortableServer::Current>::release (
     PortableServer::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::Current_ptr
@@ -89,7 +89,7 @@ TAO::Objref_Traits<PortableServer::Current>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::Current::NoContext::NoContext (void)
@@ -115,7 +115,7 @@ PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::
 PortableServer::Current::NoContext&
 PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -198,7 +198,7 @@ static TAO::TypeCode::Struct<char const *,
     "NoContext",
     _tao_fields_PortableServer_Current_NoContext,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
   &_tao_tc_PortableServer_Current_NoContext;
 
@@ -233,18 +233,18 @@ PortableServer::Current::_unchecked_narrow (
 PortableServer::Current_ptr
 PortableServer::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -300,7 +300,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/Current:2.3",
     "Current");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 6b5bb141a5a..65b625bf850 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -78,7 +78,7 @@ PortableServer::POAList::POAList (void)
 PortableServer::POAList::POAList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         PortableServer::POA,
         PortableServer::POA_var
       >
@@ -91,7 +91,7 @@ PortableServer::POAList::POAList (
     PortableServer::POA_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         PortableServer::POA,
         PortableServer::POA_var
       >
@@ -101,7 +101,7 @@ PortableServer::POAList::POAList (
 PortableServer::POAList::POAList (
     const POAList &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         PortableServer::POA,
         PortableServer::POA_var
       >
@@ -140,7 +140,7 @@ TAO::Objref_Traits<PortableServer::POA>::release (
     PortableServer::POA_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::POA_ptr
@@ -184,7 +184,7 @@ PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::Portabl
 PortableServer::POA::AdapterAlreadyExists&
 PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -279,7 +279,7 @@ PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableSer
 PortableServer::POA::AdapterNonExistent&
 PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -375,7 +375,7 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::
 PortableServer::POA::InvalidPolicy&
 PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->index = _tao_excp.index;
   return *this;
 }
@@ -489,7 +489,7 @@ PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServan
 PortableServer::POA::NoServant&
 PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -586,7 +586,7 @@ PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableS
 PortableServer::POA::ObjectAlreadyActive&
 PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -681,7 +681,7 @@ PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::P
 PortableServer::POA::ObjectNotActive&
 PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -776,7 +776,7 @@ PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::Portabl
 PortableServer::POA::ServantAlreadyActive&
 PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -871,7 +871,7 @@ PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer:
 PortableServer::POA::ServantNotActive&
 PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -966,7 +966,7 @@ PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::Wr
 PortableServer::POA::WrongAdapter&
 PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1061,7 +1061,7 @@ PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::Wron
 PortableServer::POA::WrongPolicy&
 PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1141,7 +1141,7 @@ PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
     static_cast<POA *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::POA_ptr
@@ -1169,7 +1169,7 @@ PortableServer::POA::_unchecked_narrow (
 PortableServer::POA_ptr
 PortableServer::POA::_duplicate (POA_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -1180,7 +1180,7 @@ PortableServer::POA::_duplicate (POA_ptr obj)
 void
 PortableServer::POA::_tao_release (POA_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 4609975b004..f84d9eeaa47 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -97,29 +97,20 @@ namespace PortableServer
   class POAList;
 
   typedef
-    TAO_MngSeq_Var_T<
-        POAList,
-        TAO_Object_Manager<
-            POA,
-            POA_var
-          >
+    TAO_VarSeq_Var_T<
+        POAList
       >
     POAList_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        POAList,
-        POAList_var,
-        TAO_Object_Manager<
-            POA,
-            POA_var
-          >
+    TAO_Seq_Out_T<
+        POAList
       >
     POAList_out;
 
   class TAO_PortableServer_Export POAList
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             POA,
             POA_var
           >
@@ -131,7 +122,7 @@ namespace PortableServer
         CORBA::ULong max,
         CORBA::ULong length,
         POA_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     POAList (const POAList &);
     ~POAList (void);
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
index d980d70fd44..fc0a43d63bd 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::RequestProcessingPolicy_ptr
@@ -113,18 +113,18 @@ PortableServer::RequestProcessingPolicy::_unchecked_narrow (
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::RequestProcessingPolicy::_tao_release (RequestProcessingPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -183,12 +183,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessin
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
index 2fb05a0669e..8485ca95627 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -65,7 +65,7 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::release (
     PortableServer::ServantActivator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantActivator_ptr
@@ -114,18 +114,18 @@ PortableServer::ServantActivator::_unchecked_narrow (
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantActivator::_tao_release (ServantActivator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
index b58ab9d6972..d03dcd7c693 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -65,7 +65,7 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::release (
     PortableServer::ServantLocator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantLocator_ptr
@@ -114,18 +114,18 @@ PortableServer::ServantLocator::_unchecked_narrow (
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantLocator::_tao_release (ServantLocator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
index 2d798612889..d95b2bf7ef9 100644
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableServer::ServantManager>::release (
     PortableServer::ServantManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantManager_ptr
@@ -112,18 +112,18 @@ PortableServer::ServantManager::_unchecked_narrow (
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantManager::_tao_release (ServantManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
index fd103bdc342..72bbd0a469b 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantRetentionPolicy_ptr
@@ -113,18 +113,18 @@ PortableServer::ServantRetentionPolicy::_unchecked_narrow (
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantRetentionPolicy::_tao_release (ServantRetentionPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -183,12 +183,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::ServantRetentionPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
index 41e88033055..20e68c44774 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
     PortableServer::ThreadPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ThreadPolicy_ptr
@@ -113,18 +113,18 @@ PortableServer::ThreadPolicy::_unchecked_narrow (
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ThreadPolicy::_tao_release (ThreadPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -183,12 +183,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValu
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::ThreadPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index ba915b0adf1..feb061920c7 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -8,6 +8,8 @@
 
 #include <algorithm>  /* For std::swap<>() */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename T>
 TAO_Value_Var_T<T>::TAO_Value_Var_T (void)
   : ptr_ (0)