ChangeLogTag: Wed Apr 27 18:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

21 files changed, 683 insertions, 522 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index a0cf3eac176..3e5bd9218c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -63,9 +63,11 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
   if (node->is_local ())
     {
       *os << be_nl << be_nl
+          << "namespace TAO" << be_nl
+          << "{" << be_idt_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl
+          << "Any_Array_Impl_T<" << be_idt << be_idt_nl
           << node->name () << "_slice," << be_nl
           << node->name () << "_forany" << be_uidt_nl
           << ">::marshal_value (TAO_OutputCDR &)" << be_uidt_nl
@@ -76,12 +78,13 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       *os << be_nl << be_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl
+          << "Any_Array_Impl_T<" << be_idt << be_idt_nl
           << node->name () << "_slice," << be_nl
           << node->name () << "_forany" << be_uidt_nl
           << ">::demarshal_value (TAO_OutputCDR &)" << be_uidt_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
+          << "}" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index 085bd892024..e54c1ebee72 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -61,10 +61,11 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   // type is inserted into an Any and then marshaled.
   if (node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << "namespace TAO" << be_nl
+          << "{" << be_idt_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
+          << "Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
@@ -73,15 +74,16 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       *os << be_nl << be_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
+          << "Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
-          << "}";
+          << "}" << be_uidt_nl
+          << "}" << be_nl;
     }
 
   // Copying insertion.
-  *os << "// Copying insertion." << be_nl
+  *os << be_nl << "// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "CORBA::Any &_tao_any," << be_nl
       << "const " << node->name () << " &_tao_elem" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index cd1ab7610e4..86cf886ca09 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -62,9 +62,11 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
   if (node->is_local ())
     {
       *os << be_nl << be_nl
+          << "namespace TAO" << be_nl
+          << "{" << be_idt_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
+          << "Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
@@ -73,10 +75,11 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       *os << be_nl << be_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
+          << "Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
+          << "}" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index d90680fac40..af7d89570d7 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -62,9 +62,11 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
   if (node->is_local ())
     {
       *os << be_nl << be_nl
+          << "namespace TAO" << be_nl
+          << "{" << be_idt_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
+          << "Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
@@ -73,10 +75,11 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       *os << be_nl << be_nl
           << "template<>" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
+          << "Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
+          << "}" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index 6887c191370..e3cf6056c56 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -59,9 +59,11 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
   // All template specializations must be generated before the instantiations
   // in the operators.
   *os << be_nl << be_nl
+      << "namespace TAO" << be_nl
+      << "{" << be_idt_nl
       << "template<>" << be_nl
       << "CORBA::Boolean" << be_nl
-      << "TAO::Any_Impl_T<" << node->name () << ">::to_value ("
+      << "Any_Impl_T<" << node->name () << ">::to_value ("
       << be_idt <<  be_idt_nl
       << "CORBA::ValueBase *&_tao_elem" << be_uidt_nl
       << ") const" << be_uidt_nl
@@ -69,7 +71,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "CORBA::add_ref (this->value_);" << be_nl
       << "_tao_elem = this->value_;" << be_nl
       << "return 1;" << be_uidt_nl
-      << "}" << be_nl;
+      << "}" << be_uidt_nl
+      << "}" << be_nl << be_nl;
 
   *os << "// Copying insertion." << be_nl
       << "void" << be_nl
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 5f41f537813..e1586de690a 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -88,7 +88,7 @@ namespace TAO
     S & arg (void);
 
   private:
-    mutable S & x_;
+    S & x_;
   };
 
   /**
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index d477e949978..3b18f564342 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -32,6 +32,7 @@
 #include "tao/Objref_TypeCode.h"
 #include "tao/Sequence_TypeCode.h"
 #include "tao/Struct_TypeCode.h"
+#include "tao/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -238,31 +239,34 @@ namespace TAO_IOP
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
+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);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
 }
 
 // Copying insertion.
@@ -323,31 +327,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
+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);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
 }
 
 // Copying insertion.
@@ -408,31 +415,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
+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);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
 }
 
 // Copying insertion.
@@ -493,31 +503,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
+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);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
 }
 
 // Copying insertion.
@@ -578,31 +591,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
+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);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
 }
 
 // Copying insertion.
@@ -663,28 +679,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -732,28 +754,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -801,21 +829,24 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
-
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}// Copying insertion.
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_elem
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index 011e7e826c7..a68e891ff17 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -31,6 +31,7 @@
 #include "tao/Alias_TypeCode.h"
 #include "tao/Objref_TypeCode.h"
 #include "tao/Value_TypeCode.h"
+#include "tao/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -43,7 +44,7 @@ static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> con
     { "is_system_exception", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
     { "byte_order", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
     { "marshaled_exception", &CORBA::_tc_OctetSeq, CORBA::PUBLIC_MEMBER }
-    
+
   };
 
 static TAO::TypeCode::Value<char const *,
@@ -59,7 +60,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_Messaging_ExceptionHolder,
     3);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
@@ -77,7 +78,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_Messaging_ReplyHandler (
     "IDL:omg.org/Messaging/ReplyHandler:1.0",
     "ReplyHandler");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyHandler =
@@ -89,16 +90,20 @@ namespace Messaging
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/any_op_cs.cpp:57
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
+namespace TAO
 {
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ExceptionHolder>::to_value (
+      CORBA::ValueBase *&_tao_elem
+    ) const
+  {
+    CORBA::add_ref (this->value_);
+    _tao_elem = this->value_;
+    return 1;
+  }
 }
+
 // Copying insertion.
 void
 operator<<= (
@@ -145,14 +150,17 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyHandler>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 31625a8d07f..4da94e861da 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -96,7 +96,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
index 4c2e151be0b..9b7537d8357 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
@@ -31,6 +31,7 @@
 #include "tao/Alias_TypeCode.h"
 #include "tao/Objref_TypeCode.h"
 #include "tao/Struct_TypeCode.h"
+#include "tao/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -375,28 +376,34 @@ namespace Messaging
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RebindPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -502,28 +509,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -571,28 +584,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -640,28 +659,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -709,28 +734,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -778,28 +809,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -847,28 +884,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -916,28 +959,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -1043,28 +1092,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RoutingPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -1112,28 +1167,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::MaxHopsPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -1181,28 +1242,34 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::QueueOrderPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
index a970be68d9e..d8f84a03e36 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
@@ -75,28 +75,34 @@ namespace Messaging
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
index 2330c7546bb..65461b77bb6 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
@@ -55,28 +55,34 @@ namespace Messaging
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::SyncScopePolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp
index 456cb4a6558..dd76529772c 100644
--- a/TAO/tao/Messaging/TAO_ExtA.cpp
+++ b/TAO/tao/Messaging/TAO_ExtA.cpp
@@ -55,28 +55,34 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO::ConnectionTimeoutPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index 8e041aad526..ebb1ef806e6 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -31,6 +31,7 @@
 #include "tao/Alias_TypeCode.h"
 #include "tao/String_TypeCode.h"
 #include "tao/Value_TypeCode.h"
+#include "tao/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -65,15 +66,18 @@ namespace TAO_Default_ORT
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/any_op_cs.cpp:57
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
+namespace TAO
 {
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
+      CORBA::ValueBase *&_tao_elem
+    ) const
+  {
+    CORBA::add_ref (this->value_);
+    _tao_elem = this->value_;
+    return 1;
+  }
 }
 // Copying insertion.
 void
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index 5335099e6ce..fc315d0e6e5 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -32,6 +32,7 @@
 #include "tao/Sequence_TypeCode.h"
 #include "tao/String_TypeCode.h"
 #include "tao/Value_TypeCode.h"
+#include "tao/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -141,15 +142,18 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/any_op_cs.cpp:57
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
+namespace TAO
 {
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
+      CORBA::ValueBase *&_tao_elem
+    ) const
+  {
+    CORBA::add_ref (this->value_);
+    _tao_elem = this->value_;
+    return 1;
+  }
 }
 // Copying insertion.
 void
@@ -197,15 +201,18 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/any_op_cs.cpp:57
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
+namespace TAO
 {
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
+      CORBA::ValueBase *&_tao_elem
+    ) const
+  {
+    CORBA::add_ref (this->value_);
+    _tao_elem = this->value_;
+    return 1;
+  }
 }
 // Copying insertion.
 void
@@ -253,6 +260,7 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
+
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 7575d4ecf85..16cd912fcba 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -55,7 +55,7 @@ namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index b132bb85aa1..456e5d9a9d8 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -89,7 +89,7 @@ namespace TAO
     S & arg (void);
 
   private:
-    mutable S & x_;
+    S & x_;
   };
 
   /**
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
index d451f03a698..e88f663ea90 100644
--- a/TAO/tao/TAOA.cpp
+++ b/TAO/tao/TAOA.cpp
@@ -31,6 +31,7 @@
 #include "tao/Alias_TypeCode.h"
 #include "tao/Objref_TypeCode.h"
 #include "tao/Struct_TypeCode.h"
+#include "tao/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
index 1f976bcaaaa..ae6d37f751f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
@@ -56,28 +56,34 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::TypeCodeFactory>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
+namespace TAO
 {
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::TypeCodeFactory>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index b7ba07c21d1..02c1c948b6c 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -87,7 +87,7 @@ namespace TAO
     S *& arg (void);
 
   private:
-    mutable S *& x_;
+    S *& x_;
   };
 
   /**
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index 001e8cb8450..f299f3a32c4 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -30,6 +30,7 @@
 #include "tao/TypeCode_Constants.h"
 #include "tao/Alias_TypeCode.h"
 #include "tao/Struct_TypeCode.h"
+#include "tao/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
@@ -61,31 +62,34 @@ namespace CORBA
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
+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);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
 }
 
 // Copying insertion.