ChangeLogTag:Wed Apr 16 00:18:08 2003 Ossama Othman <ossama@uci.edu>

29 files changed, 254 insertions, 211 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ebfed788df1..8cd0266055c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -25,7 +25,7 @@ Wed Apr 16 00:18:08 2003  Ossama Othman  <ossama@uci.edu>
 	* tao/Exception.h:
 
 	  Include "ace/SStringfwd.h" and "ace/iosfwd.h" instead of
-	  "ace/SString.h".  The latter is more expensive than the latter
+	  "ace/SString.h".  The latter is more expensive than the former
 	  two.
 
 	  Forward declare "ACE_Allocator" class.  Necessitated by above
diff --git a/TAO/tao/AbstractBase.cpp b/TAO/tao/AbstractBase.cpp
index 91ed3acd319..60b70882170 100644
--- a/TAO/tao/AbstractBase.cpp
+++ b/TAO/tao/AbstractBase.cpp
@@ -64,6 +64,14 @@ CORBA::AbstractBase::~AbstractBase (void)
     }
 }
 
+CORBA::Boolean
+CORBA::AbstractBase::_is_a (const char *type_id
+                            ACE_ENV_ARG_DECL_NOT_USED)
+{
+  return ! ACE_OS::strcmp (type_id,
+                           "IDL:omg.org/CORBA/AbstractBase:1.0");
+}
+
 void *
 CORBA::AbstractBase::_tao_QueryInterface (ptr_arith_t type)
 {
@@ -341,4 +349,3 @@ CORBA::AbstractBase::_tao_to_value (void)
 {
   return 0;
 }
-
diff --git a/TAO/tao/AbstractBase.inl b/TAO/tao/AbstractBase.inl
index f100f7f3c4d..801f2be69d3 100644
--- a/TAO/tao/AbstractBase.inl
+++ b/TAO/tao/AbstractBase.inl
@@ -2,14 +2,14 @@
 //
 // $Id$
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_nil (void)
 {
   return 0;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
 {
@@ -22,7 +22,7 @@ CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
 }
 
 /// Just call _duplicate and let it decide what to do.
-ACE_INLINE 
+ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
                               ACE_ENV_ARG_DECL_NOT_USED)
@@ -31,7 +31,7 @@ CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
 }
 
 /// Same for this one.
-ACE_INLINE 
+ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_unchecked_narrow (CORBA::AbstractBase_ptr obj
                                         ACE_ENV_ARG_DECL_NOT_USED)
@@ -40,15 +40,6 @@ CORBA::AbstractBase::_unchecked_narrow (CORBA::AbstractBase_ptr obj
 }
 
 ACE_INLINE
-CORBA::Boolean
-CORBA::AbstractBase::_is_a (const char *type_id
-                            ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return ! ACE_OS::strcmp (type_id,
-                           "IDL:omg.org/CORBA/AbstractBase:1.0");
-}
-
-ACE_INLINE
 const char *
 CORBA::AbstractBase::_interface_repository_id (void) const
 {
@@ -107,7 +98,7 @@ CORBA::AbstractBase::_is_local (void) const
 // ************************************************************
 // These are in CORBA namespace
 
-ACE_INLINE 
+ACE_INLINE
 void
 CORBA::release (CORBA::AbstractBase_ptr obj)
 {
@@ -117,7 +108,7 @@ CORBA::release (CORBA::AbstractBase_ptr obj)
     }
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::Boolean
 CORBA::is_nil (CORBA::AbstractBase_ptr obj)
 {
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 469b148bc4b..06e91545362 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -78,7 +78,7 @@ Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
@@ -98,7 +98,7 @@ Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr)
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
@@ -188,7 +188,7 @@ CORBA::Any::replace (CORBA::TypeCode_ptr,
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-void 
+void
 CORBA::Any::replace (TAO::Any_Impl *new_impl)
 {
   if (this->impl_ != 0)
@@ -197,6 +197,8 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl)
     }
 
   this->impl_ = new_impl;
+
+  ACE_ASSERT (this->impl_ != 0);
 }
 
 CORBA::TypeCode_ptr
@@ -251,7 +253,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc
 
   if (this->impl_ != 0)
     {
-      equiv = 
+      equiv =
         this->impl_->_tao_get_typecode ()->equivalent (tc
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -392,7 +394,7 @@ TAO::Any_Impl::_remove_ref (void)
   delete this;
 }
 
-void 
+void
 TAO::Any_Impl::_tao_decode (TAO_InputCDR &
                             ACE_ENV_ARG_DECL_NOT_USED)
 {
@@ -501,11 +503,11 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
   // this by including 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional
   // space in the message block.
   size_t size = end - begin;
-  
+
   ACE_Message_Block::release (this->cdr_);
   ACE_NEW (this->cdr_,
            ACE_Message_Block (size + 2 * ACE_CDR::MAX_ALIGNMENT));
-           
+
   ACE_CDR::mb_align (this->cdr_);
   ptr_arith_t offset = ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
   this->cdr_->rd_ptr (offset);
@@ -569,7 +571,7 @@ CORBA::Any_var::operator= (const CORBA::Any_var &r)
 
 // ***********************************************************************
 
-CORBA::Boolean 
+CORBA::Boolean
 operator<< (TAO_OutputCDR &cdr, const CORBA::Any &any)
 {
   TAO::Any_Impl *impl = any.impl ();
@@ -623,7 +625,7 @@ void
 CORBA::Any::operator<<= (CORBA::Any::from_boolean b)
 {
   TAO::Any_Special_Basic_Impl_T<
-      CORBA::Boolean, 
+      CORBA::Boolean,
       CORBA::Any::from_boolean,
       CORBA::Any::to_boolean
     >::insert (*this,
@@ -635,7 +637,7 @@ void
 CORBA::Any::operator<<= (CORBA::Any::from_octet o)
 {
   TAO::Any_Special_Basic_Impl_T<
-      CORBA::Octet, 
+      CORBA::Octet,
       CORBA::Any::from_octet,
       CORBA::Any::to_octet
     >::insert (*this,
@@ -647,7 +649,7 @@ void
 CORBA::Any::operator<<= (CORBA::Any::from_char c)
 {
   TAO::Any_Special_Basic_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_char,
       CORBA::Any::to_char
     >::insert (*this,
@@ -659,7 +661,7 @@ void
 CORBA::Any::operator<<= (CORBA::Any::from_wchar wc)
 {
   TAO::Any_Special_Basic_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wchar,
       CORBA::Any::to_wchar
     >::insert (*this,
@@ -676,7 +678,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_string s)
     }
 
   TAO::Any_Special_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_string,
       CORBA::Any::to_string
     >::insert (*this,
@@ -695,7 +697,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
     }
 
   TAO::Any_Special_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wstring,
       CORBA::Any::to_wstring
     >::insert (*this,
@@ -896,7 +898,7 @@ CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_boolean b) const
 {
   return TAO::Any_Special_Basic_Impl_T<
-      CORBA::Boolean, 
+      CORBA::Boolean,
       CORBA::Any::from_boolean,
       CORBA::Any::to_boolean
     >::extract (*this,
@@ -908,7 +910,7 @@ CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_octet o) const
 {
   return TAO::Any_Special_Basic_Impl_T<
-      CORBA::Octet, 
+      CORBA::Octet,
       CORBA::Any::from_octet,
       CORBA::Any::to_octet
     >::extract (*this,
@@ -920,7 +922,7 @@ CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_char c) const
 {
   return TAO::Any_Special_Basic_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_char,
       CORBA::Any::to_char
     >::extract (*this,
@@ -932,7 +934,7 @@ CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
 {
   return TAO::Any_Special_Basic_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wchar,
       CORBA::Any::to_wchar
     >::extract (*this,
@@ -943,9 +945,9 @@ CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
 CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_string s) const
 {
-  return 
+  return
     TAO::Any_Special_Impl_T<
-        char, 
+        char,
         CORBA::Any::from_string,
         CORBA::Any::to_string
       >::extract (*this,
@@ -958,9 +960,9 @@ CORBA::Any::operator>>= (CORBA::Any::to_string s) const
 CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_wstring ws) const
 {
-  return 
+  return
     TAO::Any_Special_Impl_T<
-        CORBA::WChar, 
+        CORBA::WChar,
         CORBA::Any::from_wstring,
         CORBA::Any::to_wstring
       >::extract (*this,
@@ -1025,7 +1027,7 @@ operator>>= (const CORBA::Any &any, CORBA::ULong &ul)
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
 {
-  return 
+  return
     TAO::Any_Basic_Impl_T<CORBA::LongLong>::extract (any,
                                                      CORBA::_tc_longlong,
                                                      ll);
@@ -1034,7 +1036,7 @@ operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::ULongLong &ull)
 {
-  return 
+  return
     TAO::Any_Basic_Impl_T<CORBA::ULongLong>::extract (any,
                                                       CORBA::_tc_ulonglong,
                                                       ull);
@@ -1059,7 +1061,7 @@ operator>>= (const CORBA::Any &any, CORBA::Double &d)
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::LongDouble &ld)
 {
-  return 
+  return
     TAO::Any_Basic_Impl_T<CORBA::LongDouble>::extract (any,
                                                        CORBA::_tc_longdouble,
                                                        ld);
@@ -1112,37 +1114,37 @@ operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO::Any_Special_Basic_Impl_T<
-      CORBA::Boolean, 
+      CORBA::Boolean,
       CORBA::Any::from_boolean,
       CORBA::Any::to_boolean
     >;
 
 template class TAO::Any_Special_Basic_Impl_T<
-      CORBA::Octet, 
+      CORBA::Octet,
       CORBA::Any::from_octet,
       CORBA::Any::to_octet
     >;
 
 template class TAO::Any_Special_Basic_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_char,
       CORBA::Any::to_char
     >;
 
 template class TAO::Any_Special_Basic_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wchar,
       CORBA::Any::to_wchar
     >;
 
 template class TAO::Any_Special_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_string,
       CORBA::Any::to_string
     >;
 
 template class TAO::Any_Special_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wstring,
       CORBA::Any::to_wstring
     >;
@@ -1168,37 +1170,37 @@ template class TAO::Any_Impl_T<CORBA::ValueBase>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate TAO::Any_Special_Basic_Impl_T<
-      CORBA::Boolean, 
+      CORBA::Boolean,
       CORBA::Any::from_boolean,
       CORBA::Any::to_boolean
     >
 
 #pragma instantiate TAO::Any_Special_Basic_Impl_T<
-      CORBA::Octet, 
+      CORBA::Octet,
       CORBA::Any::from_octet,
       CORBA::Any::to_octet
     >
 
 #pragma instantiate TAO::Any_Special_Basic_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_char,
       CORBA::Any::to_char
     >
 
 #pragma instantiate TAO::Any_Special_Basic_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wchar,
       CORBA::Any::to_wchar
     >
 
 #pragma instantiate TAO::Any_Special_Impl_T<
-      char, 
+      char,
       CORBA::Any::from_string,
       CORBA::Any::to_string
     >
 
 #pragma instantiate TAO::Any_Special_Impl_T<
-      CORBA::WChar, 
+      CORBA::WChar,
       CORBA::Any::from_wstring,
       CORBA::Any::to_wstring
     >
diff --git a/TAO/tao/Any_T.cpp b/TAO/tao/Any_T.cpp
index 08fdc243ec2..671096b1889 100644
--- a/TAO/tao/Any_T.cpp
+++ b/TAO/tao/Any_T.cpp
@@ -31,7 +31,7 @@ TAO::Any_Impl_T<T>::~Any_Impl_T (void)
 {
 }
 
-template<typename T> 
+template<typename T>
 void
 TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
                             _tao_destructor destructor,
@@ -46,7 +46,7 @@ TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
   any.replace (new_impl);
 }
 
-template<typename T> 
+template<typename T>
 CORBA::Boolean
 TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                              _tao_destructor destructor,
@@ -91,7 +91,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                                           any_tc,
                                           0),
                       0);
-                      
+
       auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
 
       TAO_InputCDR cdr (mb->data_block (),
@@ -99,8 +99,8 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                         mb->rd_ptr () - mb->base (),
                         mb->wr_ptr () - mb->base (),
                         impl->_tao_byte_order (),
-						            TAO_DEF_GIOP_MAJOR,
-						            TAO_DEF_GIOP_MINOR);
+                        TAO_DEF_GIOP_MAJOR,
+                        TAO_DEF_GIOP_MINOR);
 
       CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -121,11 +121,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
-template<typename T> 
+template<typename T>
 void
 TAO::Any_Impl_T<T>::free_value (void)
 {
@@ -138,8 +138,8 @@ TAO::Any_Impl_T<T>::free_value (void)
   this->value_ = 0;
 }
 
-template<typename T> 
-void 
+template<typename T>
+void
 TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
                                  ACE_ENV_ARG_DECL)
 {
@@ -168,7 +168,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
 {
 }
 
-template<typename T_slice, typename T_forany> 
+template<typename T_slice, typename T_forany>
 void
 TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
                                                   _tao_destructor destructor,
@@ -184,7 +184,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
   any.replace (new_impl);
 }
 
-template<typename T_slice, typename T_forany> 
+template<typename T_slice, typename T_forany>
 CORBA::Boolean
 TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
                                                    _tao_destructor destructor,
@@ -230,7 +230,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
                                       any_tc,
                                       T_forany::tao_alloc ()),
                       0);
-                      
+
       auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
           replacement
         );
@@ -262,11 +262,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
-template<typename T_slice, typename T_forany> 
+template<typename T_slice, typename T_forany>
 void
 TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
 {
@@ -279,8 +279,8 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
   this->value_ = 0;
 }
 
-template<typename T_slice, typename T_forany> 
-void 
+template<typename T_slice, typename T_forany>
+void
 TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
                                                        ACE_ENV_ARG_DECL)
 {
@@ -324,7 +324,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
 
   if (bound > 0)
     {
-      CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, 
+      CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind,
                                             tc->kind_);
       static CORBA::Long _oc_buffer [] =
         {
@@ -355,7 +355,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
 
 template<typename T, typename from_T, typename to_T>
 CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
+TAO::Any_Special_Impl_T<T, from_T, to_T>::extract(const CORBA::Any & any,
                                                    _tao_destructor destructor,
                                                    CORBA::TypeCode_ptr tc,
                                                    const T *& _tao_elem,
@@ -367,11 +367,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
   ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
-      CORBA::TypeCode_var unaliased_any_type = 
+      CORBA::TypeCode_var unaliased_any_type =
         any_type->unalias (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TCKind any_kind = 
+      CORBA::TCKind any_kind =
         unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -383,7 +383,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
           return 0;
         }
 
-      CORBA::ULong length = 
+      CORBA::ULong length =
         unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -394,7 +394,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      typedef TAO::Any_Special_Impl_T<T, from_T, to_T> 
+      typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
         BOUNDED_TSTRING_ANY_IMPL;
 
       TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
@@ -420,7 +420,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
                                                 0,
                                                 bound),
                       0);
-                      
+
       auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
           replacement
         );
@@ -452,7 +452,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
@@ -471,8 +471,8 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
   this->value_ = 0;
 }
 
-template<typename T, typename from_T, typename to_T> 
-void 
+template<typename T, typename from_T, typename to_T>
+void
 TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
     TAO_InputCDR &cdr
     ACE_ENV_ARG_DECL
@@ -500,7 +500,7 @@ TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
 {
 }
 
-template<typename T> 
+template<typename T>
 void
 TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
                                   CORBA::TypeCode_ptr tc,
@@ -513,7 +513,7 @@ TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
   any.replace (new_impl);
 }
 
-template<typename T> 
+template<typename T>
 CORBA::Boolean
 TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
                                    CORBA::TypeCode_ptr tc,
@@ -549,9 +549,9 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
           return 1;
         }
 
-      TAO::Any_Basic_Impl_T<T> *replacement = 
+      TAO::Any_Basic_Impl_T<T> *replacement =
         TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
-                      
+
       auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
 
       TAO_InputCDR cdr (mb->data_block (),
@@ -576,11 +576,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
-template<typename T> 
+template<typename T>
 TAO::Any_Basic_Impl_T<T> *
 TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
 {
@@ -592,8 +592,8 @@ TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
   return retval;
 }
 
-template<typename T> 
-void 
+template<typename T>
+void
 TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
                                        ACE_ENV_ARG_DECL)
 {
@@ -637,7 +637,7 @@ TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::insert (
   any.replace (new_impl);
 }
 
-template<typename T, typename from_T, typename to_T> 
+template<typename T, typename from_T, typename to_T>
 CORBA::Boolean
 TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
     const CORBA::Any & any,
@@ -658,7 +658,7 @@ TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
           return 0;
         }
 
-      typedef TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> 
+      typedef TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>
         UNSIGNED_CHAR_ANY_IMPL;
 
       TAO::Any_Impl *impl = any.impl ();
@@ -684,7 +684,7 @@ TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
                       UNSIGNED_CHAR_ANY_IMPL (any_tc,
                                               0),
                       0);
-                      
+
       auto_ptr<UNSIGNED_CHAR_ANY_IMPL> replacement_safety (replacement);
 
       TAO_InputCDR cdr (mb->data_block (),
@@ -714,12 +714,12 @@ TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
-template<typename T, typename from_T, typename to_T> 
-void 
+template<typename T, typename from_T, typename to_T>
+void
 TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::_tao_decode (TAO_InputCDR &cdr
                                                              ACE_ENV_ARG_DECL)
 {
@@ -843,7 +843,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
                                                any_tc,
                                                empty_value),
                       0);
-                      
+
       auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
 
       TAO_InputCDR cdr (mb->data_block (),
@@ -873,11 +873,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
-template<typename T> 
+template<typename T>
 void
 TAO::Any_Dual_Impl_T<T>::free_value (void)
 {
@@ -890,8 +890,8 @@ TAO::Any_Dual_Impl_T<T>::free_value (void)
   this->value_ = 0;
 }
 
-template<typename T> 
-void 
+template<typename T>
+void
 TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
                                       ACE_ENV_ARG_DECL)
 {
@@ -902,4 +902,3 @@ TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
 }
 
 #endif /* TAO_ANY_T_C */
-
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index f141b3f20ca..8b1ae376135 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -4,6 +4,8 @@
 # include "tao/CORBA_String.inl"
 #endif /* ! __ACE_INLINE__ */
 
+#include "ace/OS.h"
+
 
 ACE_RCSID (tao,
            CORBA_String,
diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
index 827c68aaf88..df5e06820e5 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -26,9 +26,8 @@
 
 
 // For the (W)String_var and (W)String_out iostream operators.
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-#include "ace/streams.h"
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
+#include "ace/iosfwd.h"
+
 
 namespace CORBA
 {
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 3f8d257b635..672e1e243a0 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -32,7 +32,10 @@
 #endif /* TAO_HAS_EXCEPTIONS */
 
 #include "ace/CORBA_macros.h"
-#include "ace/SString.h"
+#include "ace/SStringfwd.h"
+#include "ace/iosfwd.h"
+
+class ACE_Allocator;
 
 class TAO_OutputCDR;
 class TAO_InputCDR;
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index 65ce36c3320..6042821d7a2 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -21,6 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Exception.h"
+#include "ace/Global_Macros.h"
 
 class TAO_Operation_Details;
 class TAO_Target_Specification;
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index c0d86311759..86b2ef8b3fe 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -38,9 +38,10 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
 }
 
 
-TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          CORBA::Boolean flag,
-                                                          void *arg)
+TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
+  TAO_ORB_Core *orb_core,
+  CORBA::Boolean flag,
+  void *arg)
   : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
     tcp_properties_ (*(ACE_static_cast
@@ -48,8 +49,8 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core
     dscp_codepoint_ (0)
 {
   TAO_IIOP_Transport* specific_transport = 0;
-  ACE_NEW(specific_transport,
-          TAO_IIOP_Transport (this, orb_core, flag));
+  ACE_NEW (specific_transport,
+           TAO_IIOP_Transport (this, orb_core, flag));
 
   // store this pointer (indirectly increment ref count)
   this->transport (specific_transport);
@@ -359,7 +360,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (void)
               CORBA::Long codepoint =
                 tph->get_dscp_codepoint ();
 
-              tos = (int)(codepoint ) << 2;
+              tos = (int)(codepoint) << 2;
             }
         }
       ACE_CATCHANY
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index 119a8e51a86..f81c5006adf 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -25,6 +25,7 @@
 
 #include "Messaging_SyncScopeC.h"
 #include "tao/Typecode.h"
+#include "ace/OS.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 9ae776a5ded..6a96ca61b66 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -24,8 +24,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Unbounded_Queue.h"
+#include "ace/Synch.h"
 #include "tao/Any.h"
 
+
 class TAO_InputCDR;
 
 namespace CORBA
@@ -171,7 +173,7 @@ namespace CORBA
    * @class NVList
    *
    * @brief CORBA::NVList implementation.
-   
+
    * This is used in the (client side) DII (Dynamic Invocation
    * Interface) to hold parameters, except for the return
    * parameter. It's used in the same role in the (server side) DSI
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 2b869257fee..75d6092ed08 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -17,6 +17,7 @@
 #include "tao/Dynamic_Adapter.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Synch.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Object.i"
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 58de54456b6..55fbbc06a5c 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -29,9 +29,11 @@
 
 #include "tao/Policy_ForwardC.h"
 #include "tao/Object_KeyC.h"
+
 #include "ace/Synch.h"
 #include "tao/IOP_IORC.h"
 
+
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 class TAO_Object_Proxy_Broker;
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 4e68b872b3c..e95811bc841 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -32,6 +32,8 @@
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
+#include "ace/ACE.h"
+
 #if !defined (__ACE_INLINE__)
 #include "Object_KeyC.i"
 #endif /* !defined INLINE */
@@ -43,15 +45,15 @@ static const CORBA::Long _oc_TAO_ObjectKey[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   22,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744b65), 
-  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744b65),
+  ACE_NTOHL (0x793a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/ObjectKey:1.0
     10,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744b65), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744b65),
   ACE_NTOHL (0x79000000),  // name = ObjectKey
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -88,27 +90,27 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
           ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_tao_sequence);
         if (oseq->mb ())
           return strm.write_octet_array_mb (oseq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
-      
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
 
@@ -118,7 +120,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -128,18 +130,18 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -149,7 +151,7 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
             ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
           oseq->replace (_tao_seq_len, strm.start ());
           oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -160,10 +162,10 @@ CORBA::Boolean operator>> (
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
 
@@ -252,4 +254,3 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet>
 }
 
 // ****************************************************************
-
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
index cf78deaabbd..825f3f2c0cb 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -61,16 +61,19 @@ public:
   Parser_Iterator end (void) const;
 
 private:
+
   // The parser registry should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Parser_Registry (const TAO_Parser_Registry&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Parser_Registry&))
+  TAO_Parser_Registry (const TAO_Parser_Registry&);
+  void operator= (const TAO_Parser_Registry&);
 
 private:
+
   /// List of parsers
   TAO_IOR_Parser **parsers_;
 
   /// Number of parsers
   size_t size_;
+
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index a2efd1724fd..c04eb14d8ae 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -626,6 +626,16 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   // destroyed yet or not.
   this->root_->_add_ref ();
 
+  // Lock access for the duration of this transaction.
+  TAO_POA_Guard poa_guard(*this->root_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for servants managed by the Root POA.
+  this->root_->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
   // Release the POA_Manager_var since we got here without error.  The
   // TAO_POA object takes ownership of the POA_Manager object
   // (actually it shares the ownership with its peers).
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 3835584d3e8..28304a01fa4 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -870,8 +870,8 @@ public:
   // details.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 
-  int init (int argc,
-            ACE_TCHAR* argv[]);
+  virtual int init (int argc,
+                    ACE_TCHAR* argv[]);
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory)
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index c5e8e5dc215..650f95f9cc6 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -354,12 +354,6 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
   // descrease it upon destruction.
   CORBA::add_ref (this->ort_template_.in ());
   this->obj_ref_factory_ = this->ort_template_;
-
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  this->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 TAO_POA::~TAO_POA (void)
@@ -577,6 +571,12 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                         0);
     }
 
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  poa->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
   // Note: Creating a POA using a POA manager that is in the active
   // state can lead to race conditions if the POA supports preexisting
   // objects, because the new POA may receive a request before its
@@ -1007,16 +1007,17 @@ TAO_POA::add_ior_component_to_profile (
 }
 
 void
-TAO_POA::adapter_state_changed (const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
-                                PortableInterceptor::AdapterState state
-                                ACE_ENV_ARG_DECL)
+TAO_POA::adapter_state_changed (
+   const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
+   PortableInterceptor::AdapterState state
+   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// First get a list of all the interceptors.
   TAO_IORInterceptor_List::TYPE &interceptors =
     this->orb_core_.ior_interceptors ();
 
-  size_t interceptor_count = interceptors.size ();
+  const size_t interceptor_count = interceptors.size ();
 
   if (interceptor_count == 0)
     return;
@@ -2437,21 +2438,23 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
   PortableServer::ObjectId_var system_id;
   PortableServer::Servant servant;
   CORBA::Short priority;
-  if (this->active_object_map ().find_servant_and_system_id_using_user_id (id,
-                                                                           servant,
-                                                                           system_id.out (),
-                                                                           priority) == 0)
-    {
-      // Create object key.
-      TAO::ObjectKey_var key = this->create_object_key (system_id.in ());
-
-      // Ask the ORB to create you a reference
-      return this->key_to_object (key.in (),
-                                  servant->_interface_repository_id (),
-                                  servant,
-                                  1,
-                                  priority
-                                  ACE_ENV_ARG_PARAMETER);
+  if (this->active_object_map ().find_servant_and_system_id_using_user_id (
+        id,
+        servant,
+        system_id.out (),
+        priority) == 0)
+    {
+      // Ask the ORT to create a reference
+      PortableInterceptor::ObjectId oid (id.length (),
+                                         id.length (),
+                                         ACE_const_cast (CORBA::Octet *,
+                                                         id.get_buffer ()),
+                                         0);
+      return
+        this->obj_ref_factory_->make_object(
+          servant->_interface_repository_id (),
+          oid
+          ACE_ENV_ARG_PARAMETER);
     }
   else
     // If the Object Id value is not active in the POA, an
@@ -3614,6 +3617,17 @@ TAO_POA::key_to_stub_i (const TAO::ObjectKey &key,
 void
 TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
 {
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  TAO_IORInterceptor_List::TYPE &interceptors =
+    this->orb_core_.ior_interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
+
   TAO_IORInfo * tao_info;
   ACE_NEW_THROW_EX (tao_info,
                     TAO_IORInfo (this),
@@ -3626,15 +3640,8 @@ TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
 
   PortableInterceptor::IORInfo_var info = tao_info;
 
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  TAO_IORInterceptor_List::TYPE &interceptors =
-    this->orb_core_.ior_interceptors ();
-
-  size_t interceptor_count = interceptors.size ();
-  if (interceptor_count == 0)
-    return;
+  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+  ACE_UNUSED_ARG (non_servant_upcall);
 
   for (size_t i = 0; i < interceptor_count; ++i)
     {
@@ -3696,9 +3703,7 @@ TAO_POA::components_established (PortableInterceptor::IORInfo_ptr info
   TAO_IORInterceptor_List::TYPE &interceptors =
     this->orb_core_.ior_interceptors ();
 
-  size_t interceptor_count = interceptors.size ();
-  if (interceptor_count == 0)
-    return;
+  const size_t interceptor_count = interceptors.size ();
 
   // All the establish_components() interception points have been
   // invoked. Now call the components_established() interception point
@@ -3726,13 +3731,10 @@ void
 TAO_POA::save_ior_component (const IOP::TaggedComponent &component
                              ACE_ENV_ARG_DECL_NOT_USED)
 {
-  CORBA::ULong present_length = this->tagged_component_.length ();
-
-  CORBA::ULong new_length = present_length + 1;
-
-  this->tagged_component_.length (new_length);
+  const CORBA::ULong old_len = this->tagged_component_.length ();
 
-  this->tagged_component_ [present_length] = component;
+  this->tagged_component_.length (old_len + 1);
+  this->tagged_component_[old_len] = component;
 }
 
 void
@@ -3747,15 +3749,15 @@ save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
   // this->tagged_component_id_ is increased, we need to increase the
   // size of this->profile_id_array_ also.
 
-  const CORBA::ULong present_length = this->tagged_component_id_.length ();
+  const CORBA::ULong old_len = this->tagged_component_id_.length ();
 
-  const CORBA::ULong new_length = present_length + 1;
+  const CORBA::ULong new_len = old_len + 1;
 
-  this->tagged_component_id_.length (new_length);
-  this->tagged_component_id_ [present_length]= component;
+  this->tagged_component_id_.length (new_len);
+  this->tagged_component_id_[old_len] = component;
 
-  this->profile_id_array_.size (new_length);
-  this->profile_id_array_ [present_length] = profile_id;
+  this->profile_id_array_.size (new_len);
+  this->profile_id_array_[old_len] = profile_id;
 }
 
 TAO_Stub *
@@ -3880,7 +3882,7 @@ void
 TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Notifying IMR of startup\n"));
+    ACE_DEBUG ((LM_DEBUG, "Notifying ImR of startup\n"));
 
   CORBA::Object_var imr = this->orb_core ().implrepo_service ();
 
@@ -3953,13 +3955,13 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
   if (imr_locator.in () == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Couldnt narrow down the ImR interface\n"));
+                  "Couldn't narrow down the ImR interface\n"));
       return;
     }
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "Informing IMR that we are running at: %s\n",
+                "Informing ImR that we are running at: %s\n",
                 curr_addr.in ()));
 
   ACE_TRY
@@ -3986,14 +3988,14 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Successfully notified IMR of Startup\n"));
+    ACE_DEBUG ((LM_DEBUG, "Successfully notified ImR of Startup\n"));
 }
 
 void
 TAO_POA::imr_notify_shutdown (void)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Notifing IMR of Shutdown\n"));
+    ACE_DEBUG ((LM_DEBUG, "Notifing ImR of Shutdown\n"));
 
   // Notify the Implementation Repository about shutting down.
   CORBA::Object_var imr = this->orb_core ().implrepo_service ();
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 8d0aa2bbe88..f366b191441 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -105,7 +105,7 @@ protected:
 
 };
 
-// 
+//
 /**
  * @class TAO_Temporary_Creation_Time
  *
@@ -892,11 +892,11 @@ protected:
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+  /// Implementation Repository Server Object
   ServerObject_i *server_object_;
-  // Implementation Repository Server Object
 
+  /// Flag for whether the ImR should be used or not.
   int use_imr_;
-  // Flag for whether the IR should be used or not.
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 3efc35fb0ca..c0daf8729b2 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -23,6 +23,8 @@
 #include "tao/Object_KeyC.h"
 
 
+#include "ace/Synch.h"
+
 class TAO_MProfile;
 class TAO_Stub;
 class TAO_Endpoint;
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index 50cb9346c54..dcd54f52a16 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -14,16 +14,20 @@
 #define TAO_QUEUED_MESSAGE_H
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "LF_Invocation_Event.h"
+#include "tao/LF_Invocation_Event.h"
+
+struct iovec;
 
 class ACE_Message_Block;
 class ACE_Allocator;
+
+
 /**
  * @class TAO_Queued_Message
  *
diff --git a/TAO/tao/RTCORBA/Private_Transport_Descriptor.h b/TAO/tao/RTCORBA/Private_Transport_Descriptor.h
index c343f45103e..49b1f62ba36 100644
--- a/TAO/tao/RTCORBA/Private_Transport_Descriptor.h
+++ b/TAO/tao/RTCORBA/Private_Transport_Descriptor.h
@@ -60,15 +60,18 @@ public:
 private:
 
   // Descriptor should not be copied, except using the <duplicate> method.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Private_Transport_Descriptor (const TAO_Private_Transport_Descriptor&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Private_Transport_Descriptor&))
+  TAO_Private_Transport_Descriptor (const TAO_Private_Transport_Descriptor&);
+  void operator= (const TAO_Private_Transport_Descriptor&);
+
+private:
 
   /**
    * Unique identifier of the object to which private connection
    * identified with this descriptor belongs.  The value of
-   * <object_id_> is the TAO_Stub* of the object.
+   * @c object_id_ is the @c TAO_Stub* of the object.
    */
   long object_id_;
+
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 18cafdc00d7..cd8a635b7b4 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -25,6 +25,7 @@
 #include "ace/CORBA_macros.h"
 
 
+class ACE_Time_Value;
 class TAO_Transport_Descriptor_Interface;
 class TAO_InputCDR;
 class TAO_Endpoint;
diff --git a/TAO/tao/Utils/Auto_Functor.h b/TAO/tao/Utils/Auto_Functor.h
index 5306b44204e..77167a197e5 100644
--- a/TAO/tao/Utils/Auto_Functor.h
+++ b/TAO/tao/Utils/Auto_Functor.h
@@ -19,6 +19,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Environment.h"
+#include "ace/Global_Macros.h"
 
 
 namespace TAO
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index a9bf3d29618..f6cc87fd09c 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -21,6 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+class ACE_Time_Value;
 class TAO_ORB_Core;
 class TAO_Transport;
 class TAO_Synch_Reply_Dispatcher;
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 8bec4e4467b..48b819a5070 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -26,8 +26,8 @@
 #include "tao/ValueBase.h"
 #include "tao/debug.h"
 
-ACE_RCSID (tao, 
-           append, 
+ACE_RCSID (tao,
+           append,
            "$Id$")
 
 // Encode instances of arbitrary data types based only on typecode.
@@ -540,7 +540,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
         case CORBA::tk_enum:
           {
-            const CORBA::ULong *d = 
+            const CORBA::ULong *d =
               ACE_reinterpret_cast (const CORBA::ULong *,
                                     any->value ());
             if (*d == enum_v)
@@ -633,7 +633,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_TypeCode::append detected error")));
+                ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
 
   ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
@@ -1043,7 +1043,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
   // error exit
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::append detected error")));
+                ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")));
 
   ACE_THROW_RETURN (CORBA::MARSHAL (),
                     CORBA::TypeCode::TRAVERSE_STOP);
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index f71eaa5fa0a..7e2ef5c444e 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -6,11 +6,14 @@
 # include "tao/corbafwd.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "ace/OS.h"
 
-ACE_RCSID (tao, 
-           corbafwd, 
+
+ACE_RCSID (tao,
+           corbafwd,
            "$Id$")
 
+
 char *
 CORBA::string_dup (const char *str)
 {
@@ -25,14 +28,14 @@ CORBA::string_dup (const char *str)
   // This allocates an extra byte for the '\0';
   char * copy = CORBA::string_alloc (len);
 
-  // The memcpy() below assumes that the destination is a valid buffer.  
+  // The memcpy() below assumes that the destination is a valid buffer.
   if (copy == 0)
     {
       return 0;
     }
 
-  ACE_OS::memcpy (copy, 
-                  str, 
+  ACE_OS::memcpy (copy,
+                  str,
                   len + 1);
   return copy;
 }
@@ -58,7 +61,7 @@ CORBA::wstring_dup (const WChar *const str)
       return 0;
     }
 
-  return ACE_OS::wscpy (retval, 
+  return ACE_OS::wscpy (retval,
                         str);
 }
 
diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i
index 0c1c29a8917..4d5e15c680a 100644
--- a/TAO/tao/corbafwd.i
+++ b/TAO/tao/corbafwd.i
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 ACE_INLINE char *