ChangeLogTag: Fri Apr 29 09:50:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 269 insertions, 211 deletions

diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
index dd38d1bd81c..e461f0ecabb 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -112,28 +112,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 5c3465dfd59..c47cff1eeb4 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -33,6 +33,7 @@
 #include "tao/Sequence_TypeCode.h"
 #include "tao/String_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"
@@ -64,10 +65,10 @@ namespace TAO
         CORBA::tk_sequence,
         &PortableServer::_tc_POA,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_PortableServer_POAList_0 =
       &PortableServer_POAList_0;
-    
+
   }
 }
 
@@ -81,7 +82,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/PortableServer/POAList:1.0",
     "POAList",
     &TAO::TypeCode::tc_PortableServer_POAList_0);
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POAList =
@@ -105,7 +106,7 @@ static TAO::TypeCode::Struct<char const *,
     "AdapterAlreadyExists",
     _tao_fields_PortableServer_POA_AdapterAlreadyExists,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists =
   &_tao_tc_PortableServer_POA_AdapterAlreadyExists;
 
@@ -124,7 +125,7 @@ static TAO::TypeCode::Struct<char const *,
     "AdapterNonExistent",
     _tao_fields_PortableServer_POA_AdapterNonExistent,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent =
   &_tao_tc_PortableServer_POA_AdapterNonExistent;
 
@@ -134,7 +135,7 @@ static TAO::TypeCode::Struct<char const *,
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableServer_POA_InvalidPolicy[] =
   {
     { "index", &CORBA::_tc_ushort }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                              CORBA::TypeCode_ptr const *,
@@ -147,7 +148,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidPolicy",
     _tao_fields_PortableServer_POA_InvalidPolicy,
     1);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy =
   &_tao_tc_PortableServer_POA_InvalidPolicy;
 
@@ -168,7 +169,7 @@ static TAO::TypeCode::Struct<char const *,
     "NoServant",
     _tao_fields_PortableServer_POA_NoServant,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
   &_tao_tc_PortableServer_POA_NoServant;
 
@@ -189,7 +190,7 @@ static TAO::TypeCode::Struct<char const *,
     "ObjectAlreadyActive",
     _tao_fields_PortableServer_POA_ObjectAlreadyActive,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive =
   &_tao_tc_PortableServer_POA_ObjectAlreadyActive;
 
@@ -208,7 +209,7 @@ static TAO::TypeCode::Struct<char const *,
     "ObjectNotActive",
     _tao_fields_PortableServer_POA_ObjectNotActive,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive =
   &_tao_tc_PortableServer_POA_ObjectNotActive;
 
@@ -227,7 +228,7 @@ static TAO::TypeCode::Struct<char const *,
     "ServantAlreadyActive",
     _tao_fields_PortableServer_POA_ServantAlreadyActive,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive =
   &_tao_tc_PortableServer_POA_ServantAlreadyActive;
 
@@ -246,7 +247,7 @@ static TAO::TypeCode::Struct<char const *,
     "ServantNotActive",
     _tao_fields_PortableServer_POA_ServantNotActive,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive =
   &_tao_tc_PortableServer_POA_ServantNotActive;
 
@@ -265,7 +266,7 @@ static TAO::TypeCode::Struct<char const *,
     "WrongAdapter",
     _tao_fields_PortableServer_POA_WrongAdapter,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter =
   &_tao_tc_PortableServer_POA_WrongAdapter;
 
@@ -284,7 +285,7 @@ static TAO::TypeCode::Struct<char const *,
     "WrongPolicy",
     _tao_fields_PortableServer_POA_WrongPolicy,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy =
   &_tao_tc_PortableServer_POA_WrongPolicy;
 
@@ -297,7 +298,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_POA (
     "IDL:omg.org/PortableServer/POA:2.3",
     "POA");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POA =
@@ -306,24 +307,27 @@ namespace PortableServer
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
-
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}// Copying insertion.
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const PortableServer::POAList &_tao_elem
@@ -381,28 +385,34 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POA>::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<PortableServer::POA>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -447,21 +457,24 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -519,21 +532,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -591,21 +607,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -663,23 +682,26 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::NoServant>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -739,21 +761,24 @@ CORBA::Boolean operator>>= (
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -811,21 +836,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -883,21 +911,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -955,21 +986,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -1027,21 +1061,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
@@ -1099,21 +1136,24 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::marshal_value (TAO_OutputCDR &)
+namespace TAO
 {
-  return false;
-}
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
 
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
index eedc1081b5a..e89f81871d8 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_ServantActivator (
     "IDL:omg.org/PortableServer/ServantActivator:2.3",
     "ServantActivator");
-
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantActivator =
@@ -57,28 +57,34 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantActivator>::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<PortableServer::ServantActivator>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
index 2fed2c97d5d..5cd8d38fb79 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_ServantLocator (
     "IDL:omg.org/PortableServer/ServantLocator:2.3",
     "ServantLocator");
-
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantLocator =
@@ -58,28 +58,34 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantLocator>::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<PortableServer::ServantLocator>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
+namespace TAO
 {
-  return false;
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
 }
 
 // Copying insertion.