1 files changed, 20 insertions, 33 deletions
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 0e62c026f17..786ceb9746f 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -26,50 +26,37 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTPortableServerC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTPortableServer_POA[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254506f), 
-  ACE_NTOHL (0x72746162), 
-  ACE_NTOHL (0x6c655365), 
-  ACE_NTOHL (0x72766572), 
-  ACE_NTOHL (0x2f504f41), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
-    4,
-  ACE_NTOHL (0x504f4100),  // name = POA
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
-    CORBA::tk_objref,
-    sizeof (_oc_RTPortableServer_POA),
-    (char *) &_oc_RTPortableServer_POA,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTPortableServer_POA (
+    "IDL:omg.org/RTPortableServer/POA:1.0",
+    "POA");
+  
 namespace RTPortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POA =
-    &_tc_TAO_tc_RTPortableServer_POA;
+    &_tao_tc_RTPortableServer_POA;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTPortableServer::POA>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -79,14 +66,14 @@ TAO::Any_Impl_T<RTPortableServer::POA>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
 {