ChangeLogTag: Fri Mar 25 18:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

84 files changed, 4416 insertions, 10112 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 54a9af552ad..1aa846b786a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar 25 18:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/*:
+          Regenerated files that didn't cause problems on my system.
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+          Added missing include
+
+        * tao/TypeCodeFactory_Adapter.h:
+          Added include of Typecode_types.h
+
 Fri Mar 25 11:58:40 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp:
diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp
index a65dccbc580..e39c0eebd06 100644
--- a/TAO/tao/AnySeqA.cpp
+++ b/TAO/tao/AnySeqA.cpp
@@ -26,52 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "AnySeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_AnySeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f416e), 
-  ACE_NTOHL (0x79536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AnySeq:1.0
-    7,
-  ACE_NTOHL (0x416e7953), 
-  ACE_NTOHL (0x65710000),  // name = AnySeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_any,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AnySeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_AnySeq),
-    (char *) &_oc_CORBA_AnySeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AnySeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_any,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AnySeq (
+    "IDL:omg.org/CORBA/AnySeq:1.0",
+    "AnySeq",
+    &::_tao_tc_CORBA_AnySeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_AnySeq =
-    &_tc_TAO_tc_CORBA_AnySeq;
+    &_tao_tc_CORBA_AnySeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -84,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert_copy (
       _tao_any,
       CORBA::AnySeq::_tao_any_destructor,
-      CORBA::_tc_AnySeq,
+      CORBA_AnySeq_0,
       _tao_elem
     );
 }
@@ -98,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert (
       _tao_any,
       CORBA::AnySeq::_tao_any_destructor,
-      CORBA::_tc_AnySeq,
+      CORBA_AnySeq_0,
       _tao_elem
     );
 }
@@ -125,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::AnySeq>::extract (
         _tao_any,
         CORBA::AnySeq::_tao_any_destructor,
-        CORBA::_tc_AnySeq,
+        CORBA_AnySeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
index ba72d41034f..136b86311ce 100644
--- a/TAO/tao/BooleanSeqA.cpp
+++ b/TAO/tao/BooleanSeqA.cpp
@@ -26,54 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "BooleanSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_BooleanSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f426f), 
-  ACE_NTOHL (0x6f6c6561), 
-  ACE_NTOHL (0x6e536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/BooleanSeq:1.0
-    11,
-  ACE_NTOHL (0x426f6f6c), 
-  ACE_NTOHL (0x65616e53), 
-  ACE_NTOHL (0x65710000),  // name = BooleanSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_boolean,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_BooleanSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_BooleanSeq),
-    (char *) &_oc_CORBA_BooleanSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_BooleanSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_boolean,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_BooleanSeq (
+    "IDL:omg.org/CORBA/BooleanSeq:1.0",
+    "BooleanSeq",
+    &::_tao_tc_CORBA_BooleanSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_BooleanSeq =
-    &_tc_TAO_tc_CORBA_BooleanSeq;
+    &_tao_tc_CORBA_BooleanSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -86,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert_copy (
       _tao_any,
       CORBA::BooleanSeq::_tao_any_destructor,
-      CORBA::_tc_BooleanSeq,
+      CORBA_BooleanSeq_0,
       _tao_elem
     );
 }
@@ -100,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert (
       _tao_any,
       CORBA::BooleanSeq::_tao_any_destructor,
-      CORBA::_tc_BooleanSeq,
+      CORBA_BooleanSeq_0,
       _tao_elem
     );
 }
@@ -127,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::extract (
         _tao_any,
         CORBA::BooleanSeq::_tao_any_destructor,
-        CORBA::_tc_BooleanSeq,
+        CORBA_BooleanSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index d518997171e..fdcd81ba3a2 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -26,15 +26,44 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "BoundsC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_Bounds[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Bounds (
+    "IDL:omg.org/CORBA/Bounds:1.0",
+    "Bounds",
+    _tao_fields_CORBA_Bounds,
+    0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Bounds =
+    &_tao_tc_CORBA_Bounds;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
     TAO_InputCDR & cdr
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
index 246eec72483..10ff103f7ef 100644
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ b/TAO/tao/CONV_FRAMEA.cpp
@@ -26,580 +26,163 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CONV_FRAMEC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x65744964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657449), 
-  ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
-    CORBA::tk_alias,
-    sizeof (_oc_CONV_FRAME_CodeSetId),
-    (char *) &_oc_CONV_FRAME_CodeSetId,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetId (
+    "IDL:omg.org/CONV_FRAME/CodeSetId:1.0",
+    "CodeSetId",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace CONV_FRAME
 {
   ::CORBA::TypeCode_ptr const _tc_CodeSetId =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetId;
+    &_tao_tc_CONV_FRAME_CodeSetId;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
 
-static const CORBA::Long _oc_CONV_FRAME_CodeSetIdSeq[] =
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetId (
+    "IDL:omg.org/CONV_FRAME/CodeSetId:1.0",
+    "CodeSetId",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
+namespace CONV_FRAME
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x65744964), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
-    13,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657449), 
-  ACE_NTOHL (0x64536571), 
-  ACE_NTOHL (0x0),  // name = CodeSetIdSeq
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-            10,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64000000),  // name = CodeSetId
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetIdSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CONV_FRAME_CodeSetIdSeq),
-    (char *) &_oc_CONV_FRAME_CodeSetIdSeq,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_CodeSetId =
+    &_tao_tc_CONV_FRAME_CodeSetId;
+}
 
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetIdSeq_0 (
+    CORBA::tk_sequence,
+    &CONV_FRAME::_tc_CodeSetId,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetIdSeq (
+    "IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0",
+    "CodeSetIdSeq",
+    &::_tao_tc_CONV_FRAME_CodeSetIdSeq_0);
+  
 namespace CONV_FRAME
 {
   ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetIdSeq;
+    &_tao_tc_CONV_FRAME_CodeSetIdSeq;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x6574436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657443), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x0),  // name = CodeSetComponent
-  2, // member count
-    16,
-  ACE_NTOHL (0x6e617469), 
-  ACE_NTOHL (0x76655f63), 
-  ACE_NTOHL (0x6f64655f), 
-  ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x65744964), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657449), 
-    ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-  21,
-  ACE_NTOHL (0x636f6e76), 
-  ACE_NTOHL (0x65727369), 
-  ACE_NTOHL (0x6f6e5f63), 
-  ACE_NTOHL (0x6f64655f), 
-  ACE_NTOHL (0x73657473), 
-  ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_alias, // typecode kind for typedefs
-  160, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x65744964), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
-        13,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657449), 
-    ACE_NTOHL (0x64536571), 
-    ACE_NTOHL (0x0),  // name = CodeSetIdSeq
-        CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f4e56), 
-        ACE_NTOHL (0x5f465241), 
-        ACE_NTOHL (0x4d452f43), 
-        ACE_NTOHL (0x6f646553), 
-        ACE_NTOHL (0x65744964), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-                10,
-        ACE_NTOHL (0x436f6465), 
-        ACE_NTOHL (0x53657449), 
-        ACE_NTOHL (0x64000000),  // name = CodeSetId
-                CORBA::tk_ulong,
-
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
-    CORBA::tk_struct,
-    sizeof (_oc_CONV_FRAME_CodeSetComponent),
-    (char *) &_oc_CONV_FRAME_CodeSetComponent,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] =
+  {
+    { "native_code_set", &CONV_FRAME::_tc_CodeSetId },
+    { "conversion_code_sets", &CONV_FRAME::_tc_CodeSetIdSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetComponent (
+    "IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0",
+    "CodeSetComponent",
+    _tao_fields_CONV_FRAME_CodeSetComponent,
+    2);
+  
 namespace CONV_FRAME
 {
   ::CORBA::TypeCode_ptr const _tc_CodeSetComponent =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetComponent;
+    &_tao_tc_CONV_FRAME_CodeSetComponent;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x6574436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x6e666f3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-    21,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657443), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x496e666f), 
-  ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
-  2, // member count
-    12,
-  ACE_NTOHL (0x466f7243), 
-  ACE_NTOHL (0x68617244), 
-  ACE_NTOHL (0x61746100),  // name = ForCharData
-    CORBA::tk_struct, // typecode kind
-  372, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x6574436f), 
-    ACE_NTOHL (0x6d706f6e), 
-    ACE_NTOHL (0x656e743a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-        17,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657443), 
-    ACE_NTOHL (0x6f6d706f), 
-    ACE_NTOHL (0x6e656e74), 
-    ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-        16,
-    ACE_NTOHL (0x6e617469), 
-    ACE_NTOHL (0x76655f63), 
-    ACE_NTOHL (0x6f64655f), 
-    ACE_NTOHL (0x73657400),  // name = native_code_set
-        CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-            10,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64000000),  // name = CodeSetId
-            CORBA::tk_ulong,
-
-
-    21,
-    ACE_NTOHL (0x636f6e76), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5f63), 
-    ACE_NTOHL (0x6f64655f), 
-    ACE_NTOHL (0x73657473), 
-    ACE_NTOHL (0x0),  // name = conversion_code_sets
-        CORBA::tk_alias, // typecode kind for typedefs
-    160, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      40,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x5365713a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
-            13,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64536571), 
-      ACE_NTOHL (0x0),  // name = CodeSetIdSeq
-            CORBA::tk_sequence, // typecode kind
-      84, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          37,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f4e56), 
-          ACE_NTOHL (0x5f465241), 
-          ACE_NTOHL (0x4d452f43), 
-          ACE_NTOHL (0x6f646553), 
-          ACE_NTOHL (0x65744964), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-                    10,
-          ACE_NTOHL (0x436f6465), 
-          ACE_NTOHL (0x53657449), 
-          ACE_NTOHL (0x64000000),  // name = CodeSetId
-                    CORBA::tk_ulong,
-
-
-        0U,
-
-
-
-  13,
-  ACE_NTOHL (0x466f7257), 
-  ACE_NTOHL (0x63686172), 
-  ACE_NTOHL (0x44617461), 
-  ACE_NTOHL (0x0),  // name = ForWcharData
-    CORBA::tk_struct, // typecode kind
-  372, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x6574436f), 
-    ACE_NTOHL (0x6d706f6e), 
-    ACE_NTOHL (0x656e743a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-        17,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657443), 
-    ACE_NTOHL (0x6f6d706f), 
-    ACE_NTOHL (0x6e656e74), 
-    ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-        16,
-    ACE_NTOHL (0x6e617469), 
-    ACE_NTOHL (0x76655f63), 
-    ACE_NTOHL (0x6f64655f), 
-    ACE_NTOHL (0x73657400),  // name = native_code_set
-        CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-            10,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64000000),  // name = CodeSetId
-            CORBA::tk_ulong,
-
-
-    21,
-    ACE_NTOHL (0x636f6e76), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5f63), 
-    ACE_NTOHL (0x6f64655f), 
-    ACE_NTOHL (0x73657473), 
-    ACE_NTOHL (0x0),  // name = conversion_code_sets
-        CORBA::tk_alias, // typecode kind for typedefs
-    160, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      40,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x5365713a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
-            13,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64536571), 
-      ACE_NTOHL (0x0),  // name = CodeSetIdSeq
-            CORBA::tk_sequence, // typecode kind
-      84, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          37,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f4e56), 
-          ACE_NTOHL (0x5f465241), 
-          ACE_NTOHL (0x4d452f43), 
-          ACE_NTOHL (0x6f646553), 
-          ACE_NTOHL (0x65744964), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-                    10,
-          ACE_NTOHL (0x436f6465), 
-          ACE_NTOHL (0x53657449), 
-          ACE_NTOHL (0x64000000),  // name = CodeSetId
-                    CORBA::tk_ulong,
-
-
-        0U,
-
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (
-    CORBA::tk_struct,
-    sizeof (_oc_CONV_FRAME_CodeSetComponentInfo),
-    (char *) &_oc_CONV_FRAME_CodeSetComponentInfo,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] =
+  {
+    { "ForCharData", &CONV_FRAME::_tc_CodeSetComponent },
+    { "ForWcharData", &CONV_FRAME::_tc_CodeSetComponent }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetComponentInfo (
+    "IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0",
+    "CodeSetComponentInfo",
+    _tao_fields_CONV_FRAME_CodeSetComponentInfo,
+    2);
+  
 namespace CONV_FRAME
 {
   ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo;
+    &_tao_tc_CONV_FRAME_CodeSetComponentInfo;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x6574436f), 
-  ACE_NTOHL (0x6e746578), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
-    15,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657443), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78740000),  // name = CodeSetContext
-  2, // member count
-    10,
-  ACE_NTOHL (0x63686172), 
-  ACE_NTOHL (0x5f646174), 
-  ACE_NTOHL (0x61000000),  // name = char_data
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x65744964), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657449), 
-    ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-  11,
-  ACE_NTOHL (0x77636861), 
-  ACE_NTOHL (0x725f6461), 
-  ACE_NTOHL (0x74610000),  // name = wchar_data
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x65744964), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657449), 
-    ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (
-    CORBA::tk_struct,
-    sizeof (_oc_CONV_FRAME_CodeSetContext),
-    (char *) &_oc_CONV_FRAME_CodeSetContext,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CONV_FRAME_CodeSetContext[] =
+  {
+    { "char_data", &CONV_FRAME::_tc_CodeSetId },
+    { "wchar_data", &CONV_FRAME::_tc_CodeSetId }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CONV_FRAME_CodeSetContext (
+    "IDL:omg.org/CONV_FRAME/CodeSetContext:1.0",
+    "CodeSetContext",
+    _tao_fields_CONV_FRAME_CodeSetContext,
+    2);
+  
 namespace CONV_FRAME
 {
   ::CORBA::TypeCode_ptr const _tc_CodeSetContext =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetContext;
+    &_tao_tc_CONV_FRAME_CodeSetContext;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -612,7 +195,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert_copy (
       _tao_any,
       CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetIdSeq,
+      CONV_FRAME_CodeSetIdSeq_0,
       _tao_elem
     );
 }
@@ -626,7 +209,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert (
       _tao_any,
       CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetIdSeq,
+      CONV_FRAME_CodeSetIdSeq_0,
       _tao_elem
     );
 }
@@ -653,7 +236,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::extract (
         _tao_any,
         CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetIdSeq,
+        CONV_FRAME_CodeSetIdSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp
index 6f32597772b..d833f24e0fd 100644
--- a/TAO/tao/CharSeqA.cpp
+++ b/TAO/tao/CharSeqA.cpp
@@ -26,52 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CharSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_CharSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4368), 
-  ACE_NTOHL (0x61725365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/CharSeq:1.0
-    8,
-  ACE_NTOHL (0x43686172), 
-  ACE_NTOHL (0x53657100),  // name = CharSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_char,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_CharSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_CharSeq),
-    (char *) &_oc_CORBA_CharSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_CharSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_char,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_CharSeq (
+    "IDL:omg.org/CORBA/CharSeq:1.0",
+    "CharSeq",
+    &::_tao_tc_CORBA_CharSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_CharSeq =
-    &_tc_TAO_tc_CORBA_CharSeq;
+    &_tao_tc_CORBA_CharSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -84,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert_copy (
       _tao_any,
       CORBA::CharSeq::_tao_any_destructor,
-      CORBA::_tc_CharSeq,
+      CORBA_CharSeq_0,
       _tao_elem
     );
 }
@@ -98,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert (
       _tao_any,
       CORBA::CharSeq::_tao_any_destructor,
-      CORBA::_tc_CharSeq,
+      CORBA_CharSeq_0,
       _tao_elem
     );
 }
@@ -125,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::CharSeq>::extract (
         _tao_any,
         CORBA::CharSeq::_tao_any_destructor,
-        CORBA::_tc_CharSeq,
+        CORBA_CharSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
index 4fd6e63d47e..2e047217fa8 100644
--- a/TAO/tao/CurrentA.cpp
+++ b/TAO/tao/CurrentA.cpp
@@ -26,49 +26,36 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CurrentC.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/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_CORBA_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4375), 
-  ACE_NTOHL (0x7272656e), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Current),
-    (char *) &_oc_CORBA_Current,
-    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_CORBA_Current (
+    "IDL:omg.org/CORBA/Current:1.0",
+    "Current");
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tc_TAO_tc_CORBA_Current;
+    &_tao_tc_CORBA_Current;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -78,14 +65,14 @@ TAO::Any_Impl_T<CORBA::Current>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
index 2d3c37dc429..d16f6f8bd1e 100644
--- a/TAO/tao/DomainA.cpp
+++ b/TAO/tao/DomainA.cpp
@@ -26,156 +26,85 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "DomainC.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/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_DomainManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765723a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-    14,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x72000000),  // name = DomainManager
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DomainManager),
-    (char *) &_oc_CORBA_DomainManager,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_objref,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DomainManager (
+    "IDL:omg.org/CORBA/DomainManager:1.0",
+    "DomainManager");
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DomainManager =
-    &_tc_TAO_tc_CORBA_DomainManager;
+    &_tao_tc_CORBA_DomainManager;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e737472), 
-  ACE_NTOHL (0x75637469), 
-  ACE_NTOHL (0x6f6e506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
-    19,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x74727563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ConstructionPolicy),
-    (char *) &_oc_CORBA_ConstructionPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_objref,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ConstructionPolicy (
+    "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
+    "ConstructionPolicy");
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy =
-    &_tc_TAO_tc_CORBA_ConstructionPolicy;
+    &_tao_tc_CORBA_ConstructionPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_DomainManagerList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765724c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
-    18,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x74000000),  // name = DomainManagerList
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f446f), 
-      ACE_NTOHL (0x6d61696e), 
-      ACE_NTOHL (0x4d616e61), 
-      ACE_NTOHL (0x6765723a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-            14,
-      ACE_NTOHL (0x446f6d61), 
-      ACE_NTOHL (0x696e4d61), 
-      ACE_NTOHL (0x6e616765), 
-      ACE_NTOHL (0x72000000),  // name = DomainManager
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_DomainManagerList),
-    (char *) &_oc_CORBA_DomainManagerList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DomainManagerList_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_DomainManager,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DomainManagerList (
+    "IDL:omg.org/CORBA/DomainManagerList:1.0",
+    "DomainManagerList",
+    &::_tao_tc_CORBA_DomainManagerList_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DomainManagerList =
-    &_tc_TAO_tc_CORBA_DomainManagerList;
+    &_tao_tc_CORBA_DomainManagerList;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::DomainManager>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -230,7 +159,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::ConstructionPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -294,7 +223,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy (
       _tao_any,
       CORBA::DomainManagerList::_tao_any_destructor,
-      CORBA::_tc_DomainManagerList,
+      CORBA_DomainManagerList_0,
       _tao_elem
     );
 }
@@ -308,7 +237,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert (
       _tao_any,
       CORBA::DomainManagerList::_tao_any_destructor,
-      CORBA::_tc_DomainManagerList,
+      CORBA_DomainManagerList_0,
       _tao_elem
     );
 }
@@ -335,7 +264,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract (
         _tao_any,
         CORBA::DomainManagerList::_tao_any_destructor,
-        CORBA::_tc_DomainManagerList,
+        CORBA_DomainManagerList_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp
index d6a187e0110..39f75458dc6 100644
--- a/TAO/tao/DoubleSeqA.cpp
+++ b/TAO/tao/DoubleSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "DoubleSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_DoubleSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x75626c65), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DoubleSeq:1.0
-    10,
-  ACE_NTOHL (0x446f7562), 
-  ACE_NTOHL (0x6c655365), 
-  ACE_NTOHL (0x71000000),  // name = DoubleSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_double,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DoubleSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_DoubleSeq),
-    (char *) &_oc_CORBA_DoubleSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DoubleSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_double,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DoubleSeq (
+    "IDL:omg.org/CORBA/DoubleSeq:1.0",
+    "DoubleSeq",
+    &::_tao_tc_CORBA_DoubleSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DoubleSeq =
-    &_tc_TAO_tc_CORBA_DoubleSeq;
+    &_tao_tc_CORBA_DoubleSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert_copy (
       _tao_any,
       CORBA::DoubleSeq::_tao_any_destructor,
-      CORBA::_tc_DoubleSeq,
+      CORBA_DoubleSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert (
       _tao_any,
       CORBA::DoubleSeq::_tao_any_destructor,
-      CORBA::_tc_DoubleSeq,
+      CORBA_DoubleSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::extract (
         _tao_any,
         CORBA::DoubleSeq::_tao_any_destructor,
-        CORBA::_tc_DoubleSeq,
+        CORBA_DoubleSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
index a948aa23174..d8c0777235a 100644
--- a/TAO/tao/DynamicA.cpp
+++ b/TAO/tao/DynamicA.cpp
@@ -26,281 +26,167 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "DynamicC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_Dynamic_ParameterList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
-    14,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x74000000),  // name = ParameterList
-    CORBA::tk_sequence, // typecode kind
-  236, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    220, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x44796e61), 
-      ACE_NTOHL (0x6d69632f), 
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
-      ACE_NTOHL (0x723a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
-            10,
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
-      ACE_NTOHL (0x72000000),  // name = Parameter
-      2, // member count
-            9,
-      ACE_NTOHL (0x61726775), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x0),  // name = argument
-            CORBA::tk_any,
-
-      5,
-      ACE_NTOHL (0x6d6f6465), 
-      ACE_NTOHL (0x0),  // name = mode
-            CORBA::tk_enum, // typecode kind
-      116, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5061), 
-        ACE_NTOHL (0x72616d65), 
-        ACE_NTOHL (0x7465724d), 
-        ACE_NTOHL (0x6f64653a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-        14,
-        ACE_NTOHL (0x50617261), 
-        ACE_NTOHL (0x6d657465), 
-        ACE_NTOHL (0x724d6f64), 
-        ACE_NTOHL (0x65000000),  // name = ParameterMode
-        3, // member count
-        9,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
-        ACE_NTOHL (0x0),  // name = PARAM_IN
-        10,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f4f55), 
-        ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-        12,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
-        ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-        
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_ParameterList),
-    (char *) &_oc_Dynamic_ParameterList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_ParameterList_0 (
+    CORBA::tk_sequence,
+    &Dynamic::_tc_Parameter,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_ParameterList (
+    "IDL:omg.org/Dynamic/ParameterList:1.0",
+    "ParameterList",
+    &::_tao_tc_Dynamic_ParameterList_0);
+  
 namespace Dynamic
 {
   ::CORBA::TypeCode_ptr const _tc_ParameterList =
-    &_tc_TAO_tc_Dynamic_ParameterList;
+    &_tao_tc_Dynamic_ParameterList;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_Dynamic_ContextList[] =
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_sequence_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_string,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StringSeq (
+    "IDL:omg.org/CORBA/StringSeq:1.0",
+    "StringSeq",
+    &::_tao_tc_CORBA_sequence_0);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x6578744c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
-    12,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x6578744c), 
-  ACE_NTOHL (0x69737400),  // name = ContextList
-    CORBA::tk_alias, // typecode kind for typedefs
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-        10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
-    ACE_NTOHL (0x71000000),  // name = StringSeq
-        CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
-      0U, // string length
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_ContextList),
-    (char *) &_oc_Dynamic_ContextList,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_StringSeq =
+    &_tao_tc_CORBA_StringSeq;
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_ContextList (
+    "IDL:omg.org/Dynamic/ContextList:1.0",
+    "ContextList",
+    &CORBA::_tc_StringSeq);
+  
 namespace Dynamic
 {
   ::CORBA::TypeCode_ptr const _tc_ContextList =
-    &_tc_TAO_tc_Dynamic_ContextList;
+    &_tao_tc_Dynamic_ContextList;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_Dynamic_ExceptionList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e4c6973), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
-    14,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e4c6973), 
-  ACE_NTOHL (0x74000000),  // name = ExceptionList
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_TypeCode,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_ExceptionList),
-    (char *) &_oc_Dynamic_ExceptionList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_ExceptionList_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_TypeCode,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_ExceptionList (
+    "IDL:omg.org/Dynamic/ExceptionList:1.0",
+    "ExceptionList",
+    &::_tao_tc_Dynamic_ExceptionList_0);
+  
 namespace Dynamic
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionList =
-    &_tc_TAO_tc_Dynamic_ExceptionList;
+    &_tao_tc_Dynamic_ExceptionList;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_Dynamic_RequestContext[] =
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_sequence_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_string,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StringSeq (
+    "IDL:omg.org/CORBA/StringSeq:1.0",
+    "StringSeq",
+    &::_tao_tc_CORBA_sequence_0);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737443), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
-    15,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737443), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78740000),  // name = RequestContext
-    CORBA::tk_alias, // typecode kind for typedefs
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-        10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
-    ACE_NTOHL (0x71000000),  // name = StringSeq
-        CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
-      0U, // string length
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_RequestContext),
-    (char *) &_oc_Dynamic_RequestContext,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_StringSeq =
+    &_tao_tc_CORBA_StringSeq;
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_RequestContext (
+    "IDL:omg.org/Dynamic/RequestContext:1.0",
+    "RequestContext",
+    &CORBA::_tc_StringSeq);
+  
 namespace Dynamic
 {
   ::CORBA::TypeCode_ptr const _tc_RequestContext =
-    &_tc_TAO_tc_Dynamic_RequestContext;
+    &_tao_tc_Dynamic_RequestContext;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -313,7 +199,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
       _tao_any,
       Dynamic::ParameterList::_tao_any_destructor,
-      Dynamic::_tc_ParameterList,
+      Dynamic_ParameterList_0,
       _tao_elem
     );
 }
@@ -327,7 +213,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
       _tao_any,
       Dynamic::ParameterList::_tao_any_destructor,
-      Dynamic::_tc_ParameterList,
+      Dynamic_ParameterList_0,
       _tao_elem
     );
 }
@@ -354,7 +240,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
         _tao_any,
         Dynamic::ParameterList::_tao_any_destructor,
-        Dynamic::_tc_ParameterList,
+        Dynamic_ParameterList_0,
         _tao_elem
       );
 }
@@ -371,7 +257,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
       _tao_any,
       Dynamic::ExceptionList::_tao_any_destructor,
-      Dynamic::_tc_ExceptionList,
+      Dynamic_ExceptionList_0,
       _tao_elem
     );
 }
@@ -385,7 +271,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
       _tao_any,
       Dynamic::ExceptionList::_tao_any_destructor,
-      Dynamic::_tc_ExceptionList,
+      Dynamic_ExceptionList_0,
       _tao_elem
     );
 }
@@ -412,7 +298,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
         _tao_any,
         Dynamic::ExceptionList::_tao_any_destructor,
-        Dynamic::_tc_ExceptionList,
+        Dynamic_ExceptionList_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
index 0effb99f813..c3f5e2c8969 100644
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ b/TAO/tao/Dynamic_ParameterA.cpp
@@ -26,87 +26,41 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Dynamic_ParameterC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static const CORBA::Long _oc_Dynamic_Parameter[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-    10,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x72000000),  // name = Parameter
-  2, // member count
-    9,
-  ACE_NTOHL (0x61726775), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x0),  // name = argument
-    CORBA::tk_any,
-
-  5,
-  ACE_NTOHL (0x6d6f6465), 
-  ACE_NTOHL (0x0),  // name = mode
-    CORBA::tk_enum, // typecode kind
-  116, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5061), 
-    ACE_NTOHL (0x72616d65), 
-    ACE_NTOHL (0x7465724d), 
-    ACE_NTOHL (0x6f64653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-    14,
-    ACE_NTOHL (0x50617261), 
-    ACE_NTOHL (0x6d657465), 
-    ACE_NTOHL (0x724d6f64), 
-    ACE_NTOHL (0x65000000),  // name = ParameterMode
-    3, // member count
-    9,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
-    ACE_NTOHL (0x0),  // name = PARAM_IN
-    10,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f4f55), 
-    ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-    12,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
-    ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_Dynamic_Parameter[] =
+  {
+    { "argument", &CORBA::_tc_any },
+    { "mode", &CORBA::_tc_ParameterMode }
     
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
-    CORBA::tk_struct,
-    sizeof (_oc_Dynamic_Parameter),
-    (char *) &_oc_Dynamic_Parameter,
-    0,
-    0
-  );
-
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Dynamic_Parameter (
+    "IDL:Dynamic/Parameter:1.0",
+    "Parameter",
+    _tao_fields_Dynamic_Parameter,
+    2);
+  
 namespace Dynamic
 {
   ::CORBA::TypeCode_ptr const _tc_Parameter =
-    &_tc_TAO_tc_Dynamic_Parameter;
+    &_tao_tc_Dynamic_Parameter;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
index e1df4bac224..49b74c1cdef 100644
--- a/TAO/tao/FloatSeqA.cpp
+++ b/TAO/tao/FloatSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "FloatSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_FloatSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f466c), 
-  ACE_NTOHL (0x6f617453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FloatSeq:1.0
-    9,
-  ACE_NTOHL (0x466c6f61), 
-  ACE_NTOHL (0x74536571), 
-  ACE_NTOHL (0x0),  // name = FloatSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_float,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_FloatSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_FloatSeq),
-    (char *) &_oc_CORBA_FloatSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_FloatSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_float,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_FloatSeq (
+    "IDL:omg.org/CORBA/FloatSeq:1.0",
+    "FloatSeq",
+    &::_tao_tc_CORBA_FloatSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_FloatSeq =
-    &_tc_TAO_tc_CORBA_FloatSeq;
+    &_tao_tc_CORBA_FloatSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert_copy (
       _tao_any,
       CORBA::FloatSeq::_tao_any_destructor,
-      CORBA::_tc_FloatSeq,
+      CORBA_FloatSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert (
       _tao_any,
       CORBA::FloatSeq::_tao_any_destructor,
-      CORBA::_tc_FloatSeq,
+      CORBA_FloatSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::extract (
         _tao_any,
         CORBA::FloatSeq::_tao_any_destructor,
-        CORBA::_tc_FloatSeq,
+        CORBA_FloatSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp
index 30c6e492cf6..0ac77413574 100644
--- a/TAO/tao/GIOPA.cpp
+++ b/TAO/tao/GIOPA.cpp
@@ -26,568 +26,119 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "GIOPC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Union_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_GIOP_AddressingDisposition[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x2f416464), 
-  ACE_NTOHL (0x72657373), 
-  ACE_NTOHL (0x696e6744), 
-  ACE_NTOHL (0x6973706f), 
-  ACE_NTOHL (0x73697469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
-    22,
-  ACE_NTOHL (0x41646472), 
-  ACE_NTOHL (0x65737369), 
-  ACE_NTOHL (0x6e674469), 
-  ACE_NTOHL (0x73706f73), 
-  ACE_NTOHL (0x6974696f), 
-  ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition (
-    CORBA::tk_alias,
-    sizeof (_oc_GIOP_AddressingDisposition),
-    (char *) &_oc_GIOP_AddressingDisposition,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_GIOP_AddressingDisposition (
+    "IDL:omg.org/GIOP/AddressingDisposition:1.0",
+    "AddressingDisposition",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace GIOP
 {
   ::CORBA::TypeCode_ptr const _tc_AddressingDisposition =
-    &_tc_TAO_tc_GIOP_AddressingDisposition;
+    &_tao_tc_GIOP_AddressingDisposition;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_GIOP_Version[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x2f566572), 
-  ACE_NTOHL (0x73696f6e), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
-    8,
-  ACE_NTOHL (0x56657273), 
-  ACE_NTOHL (0x696f6e00),  // name = Version
-  2, // member count
-    6,
-  ACE_NTOHL (0x6d616a6f), 
-  ACE_NTOHL (0x72000000),  // name = major
-    CORBA::tk_octet,
-
-  6,
-  ACE_NTOHL (0x6d696e6f), 
-  ACE_NTOHL (0x72000000),  // name = minor
-    CORBA::tk_octet,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_GIOP_Version (
-    CORBA::tk_struct,
-    sizeof (_oc_GIOP_Version),
-    (char *) &_oc_GIOP_Version,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_GIOP_Version[] =
+  {
+    { "major", &CORBA::_tc_octet },
+    { "minor", &CORBA::_tc_octet }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_GIOP_Version (
+    "IDL:omg.org/GIOP/Version:1.0",
+    "Version",
+    _tao_fields_GIOP_Version,
+    2);
+  
 namespace GIOP
 {
   ::CORBA::TypeCode_ptr const _tc_Version =
-    &_tc_TAO_tc_GIOP_Version;
+    &_tao_tc_GIOP_Version;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x2f494f52), 
-  ACE_NTOHL (0x41646472), 
-  ACE_NTOHL (0x65737369), 
-  ACE_NTOHL (0x6e67496e), 
-  ACE_NTOHL (0x666f3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
-    18,
-  ACE_NTOHL (0x494f5241), 
-  ACE_NTOHL (0x64647265), 
-  ACE_NTOHL (0x7373696e), 
-  ACE_NTOHL (0x67496e66), 
-  ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
-  2, // member count
-    23,
-  ACE_NTOHL (0x73656c65), 
-  ACE_NTOHL (0x63746564), 
-  ACE_NTOHL (0x5f70726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x5f696e64), 
-  ACE_NTOHL (0x65780000),  // name = selected_profile_index
-    CORBA::tk_ulong,
-
-  4,
-  ACE_NTOHL (0x696f7200),  // name = ior
-    CORBA::tk_struct, // typecode kind
-  432, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    24,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x494f523a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-        4,
-    ACE_NTOHL (0x494f5200),  // name = IOR
-    2, // member count
-        8,
-    ACE_NTOHL (0x74797065), 
-    ACE_NTOHL (0x5f696400),  // name = type_id
-        CORBA::tk_string, 
-    0U, // string length
-    9,
-    ACE_NTOHL (0x70726f66), 
-    ACE_NTOHL (0x696c6573), 
-    ACE_NTOHL (0x0),  // name = profiles
-        CORBA::tk_alias, // typecode kind for typedefs
-    344, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x65645072), 
-      ACE_NTOHL (0x6f66696c), 
-      ACE_NTOHL (0x65536571), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
-            17,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x65645072), 
-      ACE_NTOHL (0x6f66696c), 
-      ACE_NTOHL (0x65536571), 
-      ACE_NTOHL (0x0),  // name = TaggedProfileSeq
-            CORBA::tk_sequence, // typecode kind
-      264, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_struct, // typecode kind
-        248, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x494f502f), 
-          ACE_NTOHL (0x54616767), 
-          ACE_NTOHL (0x65645072), 
-          ACE_NTOHL (0x6f66696c), 
-          ACE_NTOHL (0x653a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-                    14,
-          ACE_NTOHL (0x54616767), 
-          ACE_NTOHL (0x65645072), 
-          ACE_NTOHL (0x6f66696c), 
-          ACE_NTOHL (0x65000000),  // name = TaggedProfile
-          2, // member count
-                    4,
-          ACE_NTOHL (0x74616700),  // name = tag
-                    CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            30,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x494f502f), 
-            ACE_NTOHL (0x50726f66), 
-            ACE_NTOHL (0x696c6549), 
-            ACE_NTOHL (0x643a312e), 
-            ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-                        10,
-            ACE_NTOHL (0x50726f66), 
-            ACE_NTOHL (0x696c6549), 
-            ACE_NTOHL (0x64000000),  // name = ProfileId
-                        CORBA::tk_ulong,
-
-
-          13,
-          ACE_NTOHL (0x70726f66), 
-          ACE_NTOHL (0x696c655f), 
-          ACE_NTOHL (0x64617461), 
-          ACE_NTOHL (0x0),  // name = profile_data
-                    CORBA::tk_alias, // typecode kind for typedefs
-          76, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            31,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f4f63), 
-            ACE_NTOHL (0x74657453), 
-            ACE_NTOHL (0x65713a31), 
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                        9,
-            ACE_NTOHL (0x4f637465), 
-            ACE_NTOHL (0x74536571), 
-            ACE_NTOHL (0x0),  // name = OctetSeq
-                        CORBA::tk_sequence, // typecode kind
-            12, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              CORBA::tk_octet,
-
-              0U,
-
-
-
-        0U,
-
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo (
-    CORBA::tk_struct,
-    sizeof (_oc_GIOP_IORAddressingInfo),
-    (char *) &_oc_GIOP_IORAddressingInfo,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_GIOP_IORAddressingInfo[] =
+  {
+    { "selected_profile_index", &CORBA::_tc_ulong },
+    { "ior", &IOP::_tc_IOR }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_GIOP_IORAddressingInfo (
+    "IDL:omg.org/GIOP/IORAddressingInfo:1.0",
+    "IORAddressingInfo",
+    _tao_fields_GIOP_IORAddressingInfo,
+    2);
+  
 namespace GIOP
 {
   ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo =
-    &_tc_TAO_tc_GIOP_IORAddressingInfo;
+    &_tao_tc_GIOP_IORAddressingInfo;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_GIOP_TargetAddress[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x2f546172), 
-  ACE_NTOHL (0x67657441), 
-  ACE_NTOHL (0x64647265), 
-  ACE_NTOHL (0x73733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
-  14,
-  ACE_NTOHL (0x54617267), 
-  ACE_NTOHL (0x65744164), 
-  ACE_NTOHL (0x64726573), 
-  ACE_NTOHL (0x73000000),  // name = TargetAddress
-    CORBA::tk_short,
-
--1, // default used index
-  3, // member count
-    ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
-  11,
-  ACE_NTOHL (0x6f626a65), 
-  ACE_NTOHL (0x63745f6b), 
-  ACE_NTOHL (0x65790000),  // name = object_key
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-  ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
-  8,
-  ACE_NTOHL (0x70726f66), 
-  ACE_NTOHL (0x696c6500),  // name = profile
-    CORBA::tk_struct, // typecode kind
-  248, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x54616767), 
-    ACE_NTOHL (0x65645072), 
-    ACE_NTOHL (0x6f66696c), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-        14,
-    ACE_NTOHL (0x54616767), 
-    ACE_NTOHL (0x65645072), 
-    ACE_NTOHL (0x6f66696c), 
-    ACE_NTOHL (0x65000000),  // name = TaggedProfile
-    2, // member count
-        4,
-    ACE_NTOHL (0x74616700),  // name = tag
-        CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x50726f66), 
-      ACE_NTOHL (0x696c6549), 
-      ACE_NTOHL (0x643a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-            10,
-      ACE_NTOHL (0x50726f66), 
-      ACE_NTOHL (0x696c6549), 
-      ACE_NTOHL (0x64000000),  // name = ProfileId
-            CORBA::tk_ulong,
-
-
-    13,
-    ACE_NTOHL (0x70726f66), 
-    ACE_NTOHL (0x696c655f), 
-    ACE_NTOHL (0x64617461), 
-    ACE_NTOHL (0x0),  // name = profile_data
-        CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4f63), 
-      ACE_NTOHL (0x74657453), 
-      ACE_NTOHL (0x65713a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-            9,
-      ACE_NTOHL (0x4f637465), 
-      ACE_NTOHL (0x74536571), 
-      ACE_NTOHL (0x0),  // name = OctetSeq
-            CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0U,
-
-
-
-  ACE_IDL_NSTOHL (0x0002), // union case label (evaluated value)
-  4,
-  ACE_NTOHL (0x696f7200),  // name = ior
-    CORBA::tk_struct, // typecode kind
-  556, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x47494f50), 
-    ACE_NTOHL (0x2f494f52), 
-    ACE_NTOHL (0x41646472), 
-    ACE_NTOHL (0x65737369), 
-    ACE_NTOHL (0x6e67496e), 
-    ACE_NTOHL (0x666f3a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
-        18,
-    ACE_NTOHL (0x494f5241), 
-    ACE_NTOHL (0x64647265), 
-    ACE_NTOHL (0x7373696e), 
-    ACE_NTOHL (0x67496e66), 
-    ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
-    2, // member count
-        23,
-    ACE_NTOHL (0x73656c65), 
-    ACE_NTOHL (0x63746564), 
-    ACE_NTOHL (0x5f70726f), 
-    ACE_NTOHL (0x66696c65), 
-    ACE_NTOHL (0x5f696e64), 
-    ACE_NTOHL (0x65780000),  // name = selected_profile_index
-        CORBA::tk_ulong,
-
-    4,
-    ACE_NTOHL (0x696f7200),  // name = ior
-        CORBA::tk_struct, // typecode kind
-    432, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      24,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x494f523a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-            4,
-      ACE_NTOHL (0x494f5200),  // name = IOR
-      2, // member count
-            8,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x5f696400),  // name = type_id
-            CORBA::tk_string, 
-      0U, // string length
-      9,
-      ACE_NTOHL (0x70726f66), 
-      ACE_NTOHL (0x696c6573), 
-      ACE_NTOHL (0x0),  // name = profiles
-            CORBA::tk_alias, // typecode kind for typedefs
-      344, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x54616767), 
-        ACE_NTOHL (0x65645072), 
-        ACE_NTOHL (0x6f66696c), 
-        ACE_NTOHL (0x65536571), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
-                17,
-        ACE_NTOHL (0x54616767), 
-        ACE_NTOHL (0x65645072), 
-        ACE_NTOHL (0x6f66696c), 
-        ACE_NTOHL (0x65536571), 
-        ACE_NTOHL (0x0),  // name = TaggedProfileSeq
-                CORBA::tk_sequence, // typecode kind
-        264, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          248, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            34,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x494f502f), 
-            ACE_NTOHL (0x54616767), 
-            ACE_NTOHL (0x65645072), 
-            ACE_NTOHL (0x6f66696c), 
-            ACE_NTOHL (0x653a312e), 
-            ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-                        14,
-            ACE_NTOHL (0x54616767), 
-            ACE_NTOHL (0x65645072), 
-            ACE_NTOHL (0x6f66696c), 
-            ACE_NTOHL (0x65000000),  // name = TaggedProfile
-            2, // member count
-                        4,
-            ACE_NTOHL (0x74616700),  // name = tag
-                        CORBA::tk_alias, // typecode kind for typedefs
-            60, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x494f502f), 
-              ACE_NTOHL (0x50726f66), 
-              ACE_NTOHL (0x696c6549), 
-              ACE_NTOHL (0x643a312e), 
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-                            10,
-              ACE_NTOHL (0x50726f66), 
-              ACE_NTOHL (0x696c6549), 
-              ACE_NTOHL (0x64000000),  // name = ProfileId
-                            CORBA::tk_ulong,
-
-
-            13,
-            ACE_NTOHL (0x70726f66), 
-            ACE_NTOHL (0x696c655f), 
-            ACE_NTOHL (0x64617461), 
-            ACE_NTOHL (0x0),  // name = profile_data
-                        CORBA::tk_alias, // typecode kind for typedefs
-            76, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              31,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4f63), 
-              ACE_NTOHL (0x74657453), 
-              ACE_NTOHL (0x65713a31), 
-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                            9,
-              ACE_NTOHL (0x4f637465), 
-              ACE_NTOHL (0x74536571), 
-              ACE_NTOHL (0x0),  // name = OctetSeq
-                            CORBA::tk_sequence, // typecode kind
-              12, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                CORBA::tk_octet,
-
-                0U,
-
-
-
-          0U,
-
-
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress (
-    CORBA::tk_union,
-    sizeof (_oc_GIOP_TargetAddress),
-    (char *) &_oc_GIOP_TargetAddress,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/union_typecode.cpp:33
+
+static TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> const _tao_cases_GIOP_TargetAddress[] =
+  {
+    TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> (0, "object_key", &CORBA::_tc_OctetSeq),
+    TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> (1, "profile", &IOP::_tc_TaggedProfile),
+    TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> (2, "ior", &GIOP::_tc_IORAddressingInfo)
+    
+  };
+
+static TAO::TypeCode::Union<char const *,
+                            TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_GIOP_TargetAddress (
+    "IDL:omg.org/GIOP/TargetAddress:1.0",
+    "TargetAddress",
+    &CORBA::_tc_short,
+    _tao_cases_GIOP_TargetAddress,
+    3,-1,
+    0, 0);
+  
 namespace GIOP
 {
   ::CORBA::TypeCode_ptr const _tc_TargetAddress =
-    &_tc_TAO_tc_GIOP_TargetAddress;
+    &_tao_tc_GIOP_TargetAddress;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
index 490c6e05872..15802479ef9 100644
--- a/TAO/tao/IIOPA.cpp
+++ b/TAO/tao/IIOPA.cpp
@@ -26,232 +26,99 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IIOPC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_IIOP_ListenPoint[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x2f4c6973), 
-  ACE_NTOHL (0x74656e50), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-    12,
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x656e506f), 
-  ACE_NTOHL (0x696e7400),  // name = ListenPoint
-  2, // member count
-    5,
-  ACE_NTOHL (0x686f7374), 
-  ACE_NTOHL (0x0),  // name = host
-    CORBA::tk_string, 
-  0U, // string length
-  5,
-  ACE_NTOHL (0x706f7274), 
-  ACE_NTOHL (0x0),  // name = port
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (
-    CORBA::tk_struct,
-    sizeof (_oc_IIOP_ListenPoint),
-    (char *) &_oc_IIOP_ListenPoint,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IIOP_ListenPoint[] =
+  {
+    { "host", &CORBA::_tc_string },
+    { "port", &CORBA::_tc_ushort }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IIOP_ListenPoint (
+    "IDL:omg.org/IIOP/ListenPoint:1.0",
+    "ListenPoint",
+    _tao_fields_IIOP_ListenPoint,
+    2);
+  
 namespace IIOP
 {
   ::CORBA::TypeCode_ptr const _tc_ListenPoint =
-    &_tc_TAO_tc_IIOP_ListenPoint;
+    &_tao_tc_IIOP_ListenPoint;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_IIOP_ListenPointList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x2f4c6973), 
-  ACE_NTOHL (0x74656e50), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-    16,
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x656e506f), 
-  ACE_NTOHL (0x696e744c), 
-  ACE_NTOHL (0x69737400),  // name = ListenPointList
-    CORBA::tk_sequence, // typecode kind
-  116, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    100, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49494f50), 
-      ACE_NTOHL (0x2f4c6973), 
-      ACE_NTOHL (0x74656e50), 
-      ACE_NTOHL (0x6f696e74), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-            12,
-      ACE_NTOHL (0x4c697374), 
-      ACE_NTOHL (0x656e506f), 
-      ACE_NTOHL (0x696e7400),  // name = ListenPoint
-      2, // member count
-            5,
-      ACE_NTOHL (0x686f7374), 
-      ACE_NTOHL (0x0),  // name = host
-            CORBA::tk_string, 
-      0U, // string length
-      5,
-      ACE_NTOHL (0x706f7274), 
-      ACE_NTOHL (0x0),  // name = port
-            CORBA::tk_ushort,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (
-    CORBA::tk_alias,
-    sizeof (_oc_IIOP_ListenPointList),
-    (char *) &_oc_IIOP_ListenPointList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_IIOP_ListenPointList_0 (
+    CORBA::tk_sequence,
+    &IIOP::_tc_ListenPoint,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IIOP_ListenPointList (
+    "IDL:omg.org/IIOP/ListenPointList:1.0",
+    "ListenPointList",
+    &::_tao_tc_IIOP_ListenPointList_0);
+  
 namespace IIOP
 {
   ::CORBA::TypeCode_ptr const _tc_ListenPointList =
-    &_tc_TAO_tc_IIOP_ListenPointList;
+    &_tao_tc_IIOP_ListenPointList;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x2f426944), 
-  ACE_NTOHL (0x69724949), 
-  ACE_NTOHL (0x4f505365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65436f6e), 
-  ACE_NTOHL (0x74657874), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
-    24,
-  ACE_NTOHL (0x42694469), 
-  ACE_NTOHL (0x7249494f), 
-  ACE_NTOHL (0x50536572), 
-  ACE_NTOHL (0x76696365), 
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
-  1, // member count
-    14,
-  ACE_NTOHL (0x6c697374), 
-  ACE_NTOHL (0x656e5f70), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x73000000),  // name = listen_points
-    CORBA::tk_alias, // typecode kind for typedefs
-  192, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49494f50), 
-    ACE_NTOHL (0x2f4c6973), 
-    ACE_NTOHL (0x74656e50), 
-    ACE_NTOHL (0x6f696e74), 
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-        16,
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x656e506f), 
-    ACE_NTOHL (0x696e744c), 
-    ACE_NTOHL (0x69737400),  // name = ListenPointList
-        CORBA::tk_sequence, // typecode kind
-    116, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      100, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49494f50), 
-        ACE_NTOHL (0x2f4c6973), 
-        ACE_NTOHL (0x74656e50), 
-        ACE_NTOHL (0x6f696e74), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-                12,
-        ACE_NTOHL (0x4c697374), 
-        ACE_NTOHL (0x656e506f), 
-        ACE_NTOHL (0x696e7400),  // name = ListenPoint
-        2, // member count
-                5,
-        ACE_NTOHL (0x686f7374), 
-        ACE_NTOHL (0x0),  // name = host
-                CORBA::tk_string, 
-        0U, // string length
-        5,
-        ACE_NTOHL (0x706f7274), 
-        ACE_NTOHL (0x0),  // name = port
-                CORBA::tk_ushort,
-
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (
-    CORBA::tk_struct,
-    sizeof (_oc_IIOP_BiDirIIOPServiceContext),
-    (char *) &_oc_IIOP_BiDirIIOPServiceContext,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] =
+  {
+    { "listen_points", &IIOP::_tc_ListenPointList }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IIOP_BiDirIIOPServiceContext (
+    "IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0",
+    "BiDirIIOPServiceContext",
+    _tao_fields_IIOP_BiDirIIOPServiceContext,
+    1);
+  
 namespace IIOP
 {
   ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext =
-    &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext;
+    &_tao_tc_IIOP_BiDirIIOPServiceContext;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -322,7 +189,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy (
       _tao_any,
       IIOP::ListenPointList::_tao_any_destructor,
-      IIOP::_tc_ListenPointList,
+      IIOP_ListenPointList_0,
       _tao_elem
     );
 }
@@ -336,7 +203,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert (
       _tao_any,
       IIOP::ListenPointList::_tao_any_destructor,
-      IIOP::_tc_ListenPointList,
+      IIOP_ListenPointList_0,
       _tao_elem
     );
 }
@@ -363,7 +230,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract (
         _tao_any,
         IIOP::ListenPointList::_tao_any_destructor,
-        IIOP::_tc_ListenPointList,
+        IIOP_ListenPointList_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
index 3af4281f9e2..689d6243e6e 100644
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ b/TAO/tao/IIOP_EndpointsA.cpp
@@ -26,145 +26,73 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IIOP_EndpointsC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x5f456e64), 
-  ACE_NTOHL (0x706f696e), 
-  ACE_NTOHL (0x745f496e), 
-  ACE_NTOHL (0x666f3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
-    19,
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x5f456e64), 
-  ACE_NTOHL (0x706f696e), 
-  ACE_NTOHL (0x745f496e), 
-  ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
-  3, // member count
-    5,
-  ACE_NTOHL (0x686f7374), 
-  ACE_NTOHL (0x0),  // name = host
-    CORBA::tk_string, 
-  0U, // string length
-  5,
-  ACE_NTOHL (0x706f7274), 
-  ACE_NTOHL (0x0),  // name = port
-    CORBA::tk_short,
-
-  9,
-  ACE_NTOHL (0x7072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = priority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info (
-    CORBA::tk_struct,
-    sizeof (_oc_TAO_IIOP_Endpoint_Info),
-    (char *) &_oc_TAO_IIOP_Endpoint_Info,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] =
+  {
+    { "host", &CORBA::_tc_string },
+    { "port", &CORBA::_tc_short },
+    { "priority", &CORBA::_tc_short }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IIOP_Endpoint_Info (
+    "IDL:TAO/IIOP_Endpoint_Info:1.0",
+    "IIOP_Endpoint_Info",
+    _tao_fields_TAO_IIOP_Endpoint_Info,
+    3);
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info =
-    &_tc_TAO_tc_TAO_IIOP_Endpoint_Info;
+    &_tao_tc_TAO_IIOP_Endpoint_Info;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x456e6470), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x53657175), 
-  ACE_NTOHL (0x656e6365), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:TAO/IIOPEndpointSequence:1.0
-    21,
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x456e6470), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x53657175), 
-  ACE_NTOHL (0x656e6365), 
-  ACE_NTOHL (0x0),  // name = IIOPEndpointSequence
-    CORBA::tk_sequence, // typecode kind
-  140, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    124, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x54414f2f), 
-      ACE_NTOHL (0x49494f50), 
-      ACE_NTOHL (0x5f456e64), 
-      ACE_NTOHL (0x706f696e), 
-      ACE_NTOHL (0x745f496e), 
-      ACE_NTOHL (0x666f3a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
-            19,
-      ACE_NTOHL (0x49494f50), 
-      ACE_NTOHL (0x5f456e64), 
-      ACE_NTOHL (0x706f696e), 
-      ACE_NTOHL (0x745f496e), 
-      ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
-      3, // member count
-            5,
-      ACE_NTOHL (0x686f7374), 
-      ACE_NTOHL (0x0),  // name = host
-            CORBA::tk_string, 
-      0U, // string length
-      5,
-      ACE_NTOHL (0x706f7274), 
-      ACE_NTOHL (0x0),  // name = port
-            CORBA::tk_short,
-
-      9,
-      ACE_NTOHL (0x7072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x0),  // name = priority
-            CORBA::tk_short,
 
 
-    0U,
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-};
 
-static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence (
-    CORBA::tk_alias,
-    sizeof (_oc_TAO_IIOPEndpointSequence),
-    (char *) &_oc_TAO_IIOPEndpointSequence,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IIOPEndpointSequence_0 (
+    CORBA::tk_sequence,
+    &TAO::_tc_IIOP_Endpoint_Info,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IIOPEndpointSequence (
+    "IDL:TAO/IIOPEndpointSequence:1.0",
+    "IIOPEndpointSequence",
+    &::_tao_tc_TAO_IIOPEndpointSequence_0);
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence =
-    &_tc_TAO_tc_TAO_IIOPEndpointSequence;
+    &_tao_tc_TAO_IIOPEndpointSequence;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -235,7 +163,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert_copy (
       _tao_any,
       TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::_tc_IIOPEndpointSequence,
+      TAO_IIOPEndpointSequence_0,
       _tao_elem
     );
 }
@@ -249,7 +177,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert (
       _tao_any,
       TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::_tc_IIOPEndpointSequence,
+      TAO_IIOPEndpointSequence_0,
       _tao_elem
     );
 }
@@ -276,7 +204,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::extract (
         _tao_any,
         TAO::IIOPEndpointSequence::_tao_any_destructor,
-        TAO::_tc_IIOPEndpointSequence,
+        TAO_IIOPEndpointSequence_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp
index beda068994e..48b80d16a4f 100644
--- a/TAO/tao/IOP_CodecA.cpp
+++ b/TAO/tao/IOP_CodecA.cpp
@@ -26,199 +26,187 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IOP_CodecC.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/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_IOP_Codec[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x633a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
-    6,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63000000),  // name = Codec
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_Codec_InvalidTypeForEncoding[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_InvalidTypeForEncoding (
+    "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+    "InvalidTypeForEncoding",
+    _tao_fields_IOP_Codec_InvalidTypeForEncoding,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
+  &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_Codec_FormatMismatch[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_Codec),
-    (char *) &_oc_IOP_Codec,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_FormatMismatch (
+    "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+    "FormatMismatch",
+    _tao_fields_IOP_Codec_FormatMismatch,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
+  &_tao_tc_IOP_Codec_FormatMismatch;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_Codec_TypeMismatch[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_TypeMismatch (
+    "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+    "TypeMismatch",
+    _tao_fields_IOP_Codec_TypeMismatch,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
+  &_tao_tc_IOP_Codec_TypeMismatch;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec (
+    "IDL:omg.org/IOP/Codec:1.0",
+    "Codec");
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Codec =
-    &_tc_TAO_tc_IOP_Codec;
+    &_tao_tc_IOP_Codec;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_IOP_EncodingFormat[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-    15,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61740000),  // name = EncodingFormat
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_EncodingFormat),
-    (char *) &_oc_IOP_EncodingFormat,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_EncodingFormat (
+    "IDL:omg.org/IOP/EncodingFormat:1.0",
+    "EncodingFormat",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
-    &_tc_TAO_tc_IOP_EncodingFormat;
+    &_tao_tc_IOP_EncodingFormat;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_IOP_Encoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
-    9,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x0),  // name = Encoding
-  3, // member count
-    7,
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x61740000),  // name = format
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61743a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-        15,
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61740000),  // name = EncodingFormat
-        CORBA::tk_short,
-
-
-  14,
-  ACE_NTOHL (0x6d616a6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e000000),  // name = major_version
-    CORBA::tk_octet,
-
-  14,
-  ACE_NTOHL (0x6d696e6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e000000),  // name = minor_version
-    CORBA::tk_octet,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_Encoding),
-    (char *) &_oc_IOP_Encoding,
-    0,
-    0
-  );
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_Encoding[] =
+  {
+    { "format", &IOP::_tc_EncodingFormat },
+    { "major_version", &CORBA::_tc_octet },
+    { "minor_version", &CORBA::_tc_octet }
+    
+  };
 
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Encoding (
+    "IDL:omg.org/IOP/Encoding:1.0",
+    "Encoding",
+    _tao_fields_IOP_Encoding,
+    3);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Encoding =
-    &_tc_TAO_tc_IOP_Encoding;
+    &_tao_tc_IOP_Encoding;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_IOP_CodecFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
-    13,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x0),  // name = CodecFactory
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_CodecFactory_UnknownEncoding[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_CodecFactory),
-    (char *) &_oc_IOP_CodecFactory,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory_UnknownEncoding (
+    "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+    "UnknownEncoding",
+    _tao_fields_IOP_CodecFactory_UnknownEncoding,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
+  &_tao_tc_IOP_CodecFactory_UnknownEncoding;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory (
+    "IDL:omg.org/IOP/CodecFactory:1.0",
+    "CodecFactory");
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_CodecFactory =
-    &_tc_TAO_tc_IOP_CodecFactory;
+    &_tao_tc_IOP_CodecFactory;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -228,14 +216,14 @@ TAO::Any_Impl_T<IOP::Codec>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
 {
@@ -287,14 +275,14 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
 {
@@ -359,14 +347,14 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
 {
@@ -431,14 +419,14 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
 {
@@ -561,7 +549,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -571,14 +559,14 @@ TAO::Any_Impl_T<IOP::CodecFactory>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
 {
@@ -630,14 +618,14 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
index 142bb7c58a3..cd9c21db308 100644
--- a/TAO/tao/IOP_IORA.cpp
+++ b/TAO/tao/IOP_IORA.cpp
@@ -26,1101 +26,326 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IOP_IORC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_IOP_ProfileId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x50726f66), 
-  ACE_NTOHL (0x696c6549), 
-  ACE_NTOHL (0x643a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-    10,
-  ACE_NTOHL (0x50726f66), 
-  ACE_NTOHL (0x696c6549), 
-  ACE_NTOHL (0x64000000),  // name = ProfileId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_ProfileId),
-    (char *) &_oc_IOP_ProfileId,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_ProfileId (
+    "IDL:omg.org/IOP/ProfileId:1.0",
+    "ProfileId",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_ProfileId =
-    &_tc_TAO_tc_IOP_ProfileId;
+    &_tao_tc_IOP_ProfileId;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IOP_TaggedProfile[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x65645072), 
-  ACE_NTOHL (0x6f66696c), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-    14,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x65645072), 
-  ACE_NTOHL (0x6f66696c), 
-  ACE_NTOHL (0x65000000),  // name = TaggedProfile
-  2, // member count
-    4,
-  ACE_NTOHL (0x74616700),  // name = tag
-    CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x643a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10,
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
-
-
-  13,
-  ACE_NTOHL (0x70726f66), 
-  ACE_NTOHL (0x696c655f), 
-  ACE_NTOHL (0x64617461), 
-  ACE_NTOHL (0x0),  // name = profile_data
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_TaggedProfile),
-    (char *) &_oc_IOP_TaggedProfile,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_TaggedProfile[] =
+  {
+    { "tag", &IOP::_tc_ProfileId },
+    { "profile_data", &CORBA::_tc_OctetSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedProfile (
+    "IDL:omg.org/IOP/TaggedProfile:1.0",
+    "TaggedProfile",
+    _tao_fields_IOP_TaggedProfile,
+    2);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TaggedProfile =
-    &_tc_TAO_tc_IOP_TaggedProfile;
+    &_tao_tc_IOP_TaggedProfile;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_IOP_TaggedProfileSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x65645072), 
-  ACE_NTOHL (0x6f66696c), 
-  ACE_NTOHL (0x65536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
-    17,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x65645072), 
-  ACE_NTOHL (0x6f66696c), 
-  ACE_NTOHL (0x65536571), 
-  ACE_NTOHL (0x0),  // name = TaggedProfileSeq
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x65645072), 
-      ACE_NTOHL (0x6f66696c), 
-      ACE_NTOHL (0x653a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-            14,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x65645072), 
-      ACE_NTOHL (0x6f66696c), 
-      ACE_NTOHL (0x65000000),  // name = TaggedProfile
-      2, // member count
-            4,
-      ACE_NTOHL (0x74616700),  // name = tag
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x643a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-                10,
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x64000000),  // name = ProfileId
-                CORBA::tk_ulong,
-
-
-      13,
-      ACE_NTOHL (0x70726f66), 
-      ACE_NTOHL (0x696c655f), 
-      ACE_NTOHL (0x64617461), 
-      ACE_NTOHL (0x0),  // name = profile_data
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfileSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_TaggedProfileSeq),
-    (char *) &_oc_IOP_TaggedProfileSeq,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedProfileSeq_0 (
+    CORBA::tk_sequence,
+    &IOP::_tc_TaggedProfile,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedProfileSeq (
+    "IDL:omg.org/IOP/TaggedProfileSeq:1.0",
+    "TaggedProfileSeq",
+    &::_tao_tc_IOP_TaggedProfileSeq_0);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq =
-    &_tc_TAO_tc_IOP_TaggedProfileSeq;
+    &_tao_tc_IOP_TaggedProfileSeq;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IOP_IOR[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  24,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x494f523a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-    4,
-  ACE_NTOHL (0x494f5200),  // name = IOR
-  2, // member count
-    8,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x5f696400),  // name = type_id
-    CORBA::tk_string, 
-  0U, // string length
-  9,
-  ACE_NTOHL (0x70726f66), 
-  ACE_NTOHL (0x696c6573), 
-  ACE_NTOHL (0x0),  // name = profiles
-    CORBA::tk_alias, // typecode kind for typedefs
-  344, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x54616767), 
-    ACE_NTOHL (0x65645072), 
-    ACE_NTOHL (0x6f66696c), 
-    ACE_NTOHL (0x65536571), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
-        17,
-    ACE_NTOHL (0x54616767), 
-    ACE_NTOHL (0x65645072), 
-    ACE_NTOHL (0x6f66696c), 
-    ACE_NTOHL (0x65536571), 
-    ACE_NTOHL (0x0),  // name = TaggedProfileSeq
-        CORBA::tk_sequence, // typecode kind
-    264, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      248, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x54616767), 
-        ACE_NTOHL (0x65645072), 
-        ACE_NTOHL (0x6f66696c), 
-        ACE_NTOHL (0x653a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-                14,
-        ACE_NTOHL (0x54616767), 
-        ACE_NTOHL (0x65645072), 
-        ACE_NTOHL (0x6f66696c), 
-        ACE_NTOHL (0x65000000),  // name = TaggedProfile
-        2, // member count
-                4,
-        ACE_NTOHL (0x74616700),  // name = tag
-                CORBA::tk_alias, // typecode kind for typedefs
-        60, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x494f502f), 
-          ACE_NTOHL (0x50726f66), 
-          ACE_NTOHL (0x696c6549), 
-          ACE_NTOHL (0x643a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-                    10,
-          ACE_NTOHL (0x50726f66), 
-          ACE_NTOHL (0x696c6549), 
-          ACE_NTOHL (0x64000000),  // name = ProfileId
-                    CORBA::tk_ulong,
-
-
-        13,
-        ACE_NTOHL (0x70726f66), 
-        ACE_NTOHL (0x696c655f), 
-        ACE_NTOHL (0x64617461), 
-        ACE_NTOHL (0x0),  // name = profile_data
-                CORBA::tk_alias, // typecode kind for typedefs
-        76, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          31,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f63), 
-          ACE_NTOHL (0x74657453), 
-          ACE_NTOHL (0x65713a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                    9,
-          ACE_NTOHL (0x4f637465), 
-          ACE_NTOHL (0x74536571), 
-          ACE_NTOHL (0x0),  // name = OctetSeq
-                    CORBA::tk_sequence, // typecode kind
-          12, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_octet,
-
-            0U,
-
-
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_IOR),
-    (char *) &_oc_IOP_IOR,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_IOR[] =
+  {
+    { "type_id", &CORBA::_tc_string },
+    { "profiles", &IOP::_tc_TaggedProfileSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_IOR (
+    "IDL:omg.org/IOP/IOR:1.0",
+    "IOR",
+    _tao_fields_IOP_IOR,
+    2);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_IOR =
-    &_tc_TAO_tc_IOP_IOR;
+    &_tao_tc_IOP_IOR;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IOP_ComponentId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x7449643a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-    12,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74496400),  // name = ComponentId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_ComponentId),
-    (char *) &_oc_IOP_ComponentId,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_ComponentId (
+    "IDL:omg.org/IOP/ComponentId:1.0",
+    "ComponentId",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_ComponentId =
-    &_tc_TAO_tc_IOP_ComponentId;
+    &_tao_tc_IOP_ComponentId;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IOP_TaggedComponent[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-    16,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-  2, // member count
-    4,
-  ACE_NTOHL (0x74616700),  // name = tag
-    CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x436f6d70), 
-    ACE_NTOHL (0x6f6e656e), 
-    ACE_NTOHL (0x7449643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12,
-    ACE_NTOHL (0x436f6d70), 
-    ACE_NTOHL (0x6f6e656e), 
-    ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
-
-
-  15,
-  ACE_NTOHL (0x636f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x745f6461), 
-  ACE_NTOHL (0x74610000),  // name = component_data
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_TaggedComponent),
-    (char *) &_oc_IOP_TaggedComponent,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_TaggedComponent[] =
+  {
+    { "tag", &IOP::_tc_ComponentId },
+    { "component_data", &CORBA::_tc_OctetSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedComponent (
+    "IDL:omg.org/IOP/TaggedComponent:1.0",
+    "TaggedComponent",
+    _tao_fields_IOP_TaggedComponent,
+    2);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TaggedComponent =
-    &_tc_TAO_tc_IOP_TaggedComponent;
+    &_tao_tc_IOP_TaggedComponent;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x69706c65), 
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x7450726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
-    25,
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x69706c65), 
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x7450726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x0),  // name = MultipleComponentProfile
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e743a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-            16,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-      2, // member count
-            4,
-      ACE_NTOHL (0x74616700),  // name = tag
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x7449643a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-                12,
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x74496400),  // name = ComponentId
-                CORBA::tk_ulong,
-
-
-      15,
-      ACE_NTOHL (0x636f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x745f6461), 
-      ACE_NTOHL (0x74610000),  // name = component_data
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_MultipleComponentProfile),
-    (char *) &_oc_IOP_MultipleComponentProfile,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_MultipleComponentProfile_0 (
+    CORBA::tk_sequence,
+    &IOP::_tc_TaggedComponent,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_MultipleComponentProfile (
+    "IDL:omg.org/IOP/MultipleComponentProfile:1.0",
+    "MultipleComponentProfile",
+    &::_tao_tc_IOP_MultipleComponentProfile_0);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile =
-    &_tc_TAO_tc_IOP_MultipleComponentProfile;
+    &_tao_tc_IOP_MultipleComponentProfile;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_IOP_TaggedComponentList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e744c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
-    20,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e744c), 
-  ACE_NTOHL (0x69737400),  // name = TaggedComponentList
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e743a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-            16,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-      2, // member count
-            4,
-      ACE_NTOHL (0x74616700),  // name = tag
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x7449643a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-                12,
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x74496400),  // name = ComponentId
-                CORBA::tk_ulong,
-
-
-      15,
-      ACE_NTOHL (0x636f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x745f6461), 
-      ACE_NTOHL (0x74610000),  // name = component_data
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_TaggedComponentList),
-    (char *) &_oc_IOP_TaggedComponentList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedComponentList_0 (
+    CORBA::tk_sequence,
+    &IOP::_tc_TaggedComponent,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedComponentList (
+    "IDL:omg.org/IOP/TaggedComponentList:1.0",
+    "TaggedComponentList",
+    &::_tao_tc_IOP_TaggedComponentList_0);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TaggedComponentList =
-    &_tc_TAO_tc_IOP_TaggedComponentList;
+    &_tao_tc_IOP_TaggedComponentList;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
-    19,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7453), 
-  ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e743a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-            16,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-      2, // member count
-            4,
-      ACE_NTOHL (0x74616700),  // name = tag
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x7449643a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-                12,
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x74496400),  // name = ComponentId
-                CORBA::tk_ulong,
-
-
-      15,
-      ACE_NTOHL (0x636f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x745f6461), 
-      ACE_NTOHL (0x74610000),  // name = component_data
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_TaggedComponentSeq),
-    (char *) &_oc_IOP_TaggedComponentSeq,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedComponentSeq_0 (
+    CORBA::tk_sequence,
+    &IOP::_tc_TaggedComponent,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_TaggedComponentSeq (
+    "IDL:omg.org/IOP/TaggedComponentSeq:1.0",
+    "TaggedComponentSeq",
+    &::_tao_tc_IOP_TaggedComponentSeq_0);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq =
-    &_tc_TAO_tc_IOP_TaggedComponentSeq;
+    &_tao_tc_IOP_TaggedComponentSeq;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IOP_ServiceId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636549), 
-  ACE_NTOHL (0x643a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-    10,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636549), 
-  ACE_NTOHL (0x64000000),  // name = ServiceId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_ServiceId),
-    (char *) &_oc_IOP_ServiceId,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_ServiceId (
+    "IDL:omg.org/IOP/ServiceId:1.0",
+    "ServiceId",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceId =
-    &_tc_TAO_tc_IOP_ServiceId;
+    &_tao_tc_IOP_ServiceId;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_IOP_ServiceContext[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-    15,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78740000),  // name = ServiceContext
-  2, // member count
-    11,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x6578745f), 
-  ACE_NTOHL (0x69640000),  // name = context_id
-    CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636549), 
-    ACE_NTOHL (0x643a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-        10,
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636549), 
-    ACE_NTOHL (0x64000000),  // name = ServiceId
-        CORBA::tk_ulong,
-
-
-  13,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x6578745f), 
-  ACE_NTOHL (0x64617461), 
-  ACE_NTOHL (0x0),  // name = context_data
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_ServiceContext),
-    (char *) &_oc_IOP_ServiceContext,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IOP_ServiceContext[] =
+  {
+    { "context_id", &IOP::_tc_ServiceId },
+    { "context_data", &CORBA::_tc_OctetSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_ServiceContext (
+    "IDL:omg.org/IOP/ServiceContext:1.0",
+    "ServiceContext",
+    _tao_fields_IOP_ServiceContext,
+    2);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceContext =
-    &_tc_TAO_tc_IOP_ServiceContext;
+    &_tao_tc_IOP_ServiceContext;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_IOP_ServiceContextList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78744c69), 
-  ACE_NTOHL (0x73743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
-    19,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78744c69), 
-  ACE_NTOHL (0x73740000),  // name = ServiceContextList
-    CORBA::tk_sequence, // typecode kind
-  272, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    256, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x69636543), 
-      ACE_NTOHL (0x6f6e7465), 
-      ACE_NTOHL (0x78743a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-            15,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x69636543), 
-      ACE_NTOHL (0x6f6e7465), 
-      ACE_NTOHL (0x78740000),  // name = ServiceContext
-      2, // member count
-            11,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x6578745f), 
-      ACE_NTOHL (0x69640000),  // name = context_id
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636549), 
-        ACE_NTOHL (0x643a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-                10,
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636549), 
-        ACE_NTOHL (0x64000000),  // name = ServiceId
-                CORBA::tk_ulong,
-
-
-      13,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x6578745f), 
-      ACE_NTOHL (0x64617461), 
-      ACE_NTOHL (0x0),  // name = context_data
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_ServiceContextList),
-    (char *) &_oc_IOP_ServiceContextList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_ServiceContextList_0 (
+    CORBA::tk_sequence,
+    &IOP::_tc_ServiceContext,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_ServiceContextList (
+    "IDL:omg.org/IOP/ServiceContextList:1.0",
+    "ServiceContextList",
+    &::_tao_tc_IOP_ServiceContextList_0);
+  
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceContextList =
-    &_tc_TAO_tc_IOP_ServiceContextList;
+    &_tao_tc_IOP_ServiceContextList;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -1191,7 +416,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert_copy (
       _tao_any,
       IOP::TaggedProfileSeq::_tao_any_destructor,
-      IOP::_tc_TaggedProfileSeq,
+      IOP_TaggedProfileSeq_0,
       _tao_elem
     );
 }
@@ -1205,7 +430,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert (
       _tao_any,
       IOP::TaggedProfileSeq::_tao_any_destructor,
-      IOP::_tc_TaggedProfileSeq,
+      IOP_TaggedProfileSeq_0,
       _tao_elem
     );
 }
@@ -1232,7 +457,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::extract (
         _tao_any,
         IOP::TaggedProfileSeq::_tao_any_destructor,
-        IOP::_tc_TaggedProfileSeq,
+        IOP_TaggedProfileSeq_0,
         _tao_elem
       );
 }
@@ -1365,7 +590,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert_copy (
       _tao_any,
       IOP::MultipleComponentProfile::_tao_any_destructor,
-      IOP::_tc_MultipleComponentProfile,
+      IOP_MultipleComponentProfile_0,
       _tao_elem
     );
 }
@@ -1379,7 +604,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert (
       _tao_any,
       IOP::MultipleComponentProfile::_tao_any_destructor,
-      IOP::_tc_MultipleComponentProfile,
+      IOP_MultipleComponentProfile_0,
       _tao_elem
     );
 }
@@ -1406,7 +631,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::extract (
         _tao_any,
         IOP::MultipleComponentProfile::_tao_any_destructor,
-        IOP::_tc_MultipleComponentProfile,
+        IOP_MultipleComponentProfile_0,
         _tao_elem
       );
 }
@@ -1423,7 +648,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert_copy (
       _tao_any,
       IOP::TaggedComponentList::_tao_any_destructor,
-      IOP::_tc_TaggedComponentList,
+      IOP_TaggedComponentList_0,
       _tao_elem
     );
 }
@@ -1437,7 +662,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert (
       _tao_any,
       IOP::TaggedComponentList::_tao_any_destructor,
-      IOP::_tc_TaggedComponentList,
+      IOP_TaggedComponentList_0,
       _tao_elem
     );
 }
@@ -1464,7 +689,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::extract (
         _tao_any,
         IOP::TaggedComponentList::_tao_any_destructor,
-        IOP::_tc_TaggedComponentList,
+        IOP_TaggedComponentList_0,
         _tao_elem
       );
 }
@@ -1481,7 +706,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert_copy (
       _tao_any,
       IOP::TaggedComponentSeq::_tao_any_destructor,
-      IOP::_tc_TaggedComponentSeq,
+      IOP_TaggedComponentSeq_0,
       _tao_elem
     );
 }
@@ -1495,7 +720,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert (
       _tao_any,
       IOP::TaggedComponentSeq::_tao_any_destructor,
-      IOP::_tc_TaggedComponentSeq,
+      IOP_TaggedComponentSeq_0,
       _tao_elem
     );
 }
@@ -1522,7 +747,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::extract (
         _tao_any,
         IOP::TaggedComponentSeq::_tao_any_destructor,
-        IOP::_tc_TaggedComponentSeq,
+        IOP_TaggedComponentSeq_0,
         _tao_elem
       );
 }
@@ -1597,7 +822,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert_copy (
       _tao_any,
       IOP::ServiceContextList::_tao_any_destructor,
-      IOP::_tc_ServiceContextList,
+      IOP_ServiceContextList_0,
       _tao_elem
     );
 }
@@ -1611,7 +836,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert (
       _tao_any,
       IOP::ServiceContextList::_tao_any_destructor,
-      IOP::_tc_ServiceContextList,
+      IOP_ServiceContextList_0,
       _tao_elem
     );
 }
@@ -1638,7 +863,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::extract (
         _tao_any,
         IOP::ServiceContextList::_tao_any_destructor,
-        IOP::_tc_ServiceContextList,
+        IOP_ServiceContextList_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 2a0bd771023..0de57fb1a15 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -202,7 +202,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index 7a257cee095..0c5b56165a6 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -292,7 +292,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "IORInfoC.inl"
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 75b5465a7a3..4f29d89fce0 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -188,7 +188,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 3f6b9a75e29..1bbe6df797b 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -257,7 +257,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "IORInterceptorC.inl"
diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp
index c6224cd84ac..478d01ac46c 100644
--- a/TAO/tao/LongDoubleSeqA.cpp
+++ b/TAO/tao/LongDoubleSeqA.cpp
@@ -26,55 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "LongDoubleSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_LongDoubleSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4c6f), 
-  ACE_NTOHL (0x6e67446f), 
-  ACE_NTOHL (0x75626c65), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LongDoubleSeq:1.0
-    14,
-  ACE_NTOHL (0x4c6f6e67), 
-  ACE_NTOHL (0x446f7562), 
-  ACE_NTOHL (0x6c655365), 
-  ACE_NTOHL (0x71000000),  // name = LongDoubleSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_longdouble,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_LongDoubleSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_LongDoubleSeq),
-    (char *) &_oc_CORBA_LongDoubleSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LongDoubleSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_longdouble,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LongDoubleSeq (
+    "IDL:omg.org/CORBA/LongDoubleSeq:1.0",
+    "LongDoubleSeq",
+    &::_tao_tc_CORBA_LongDoubleSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq =
-    &_tc_TAO_tc_CORBA_LongDoubleSeq;
+    &_tao_tc_CORBA_LongDoubleSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -87,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert_copy (
       _tao_any,
       CORBA::LongDoubleSeq::_tao_any_destructor,
-      CORBA::_tc_LongDoubleSeq,
+      CORBA_LongDoubleSeq_0,
       _tao_elem
     );
 }
@@ -101,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert (
       _tao_any,
       CORBA::LongDoubleSeq::_tao_any_destructor,
-      CORBA::_tc_LongDoubleSeq,
+      CORBA_LongDoubleSeq_0,
       _tao_elem
     );
 }
@@ -128,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::extract (
         _tao_any,
         CORBA::LongDoubleSeq::_tao_any_destructor,
-        CORBA::_tc_LongDoubleSeq,
+        CORBA_LongDoubleSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp
index d3e00457c13..7e7374ec550 100644
--- a/TAO/tao/LongLongSeqA.cpp
+++ b/TAO/tao/LongLongSeqA.cpp
@@ -26,54 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "LongLongSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_LongLongSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4c6f), 
-  ACE_NTOHL (0x6e674c6f), 
-  ACE_NTOHL (0x6e675365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/LongLongSeq:1.0
-    12,
-  ACE_NTOHL (0x4c6f6e67), 
-  ACE_NTOHL (0x4c6f6e67), 
-  ACE_NTOHL (0x53657100),  // name = LongLongSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_longlong,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_LongLongSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_LongLongSeq),
-    (char *) &_oc_CORBA_LongLongSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LongLongSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_longlong,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LongLongSeq (
+    "IDL:omg.org/CORBA/LongLongSeq:1.0",
+    "LongLongSeq",
+    &::_tao_tc_CORBA_LongLongSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_LongLongSeq =
-    &_tc_TAO_tc_CORBA_LongLongSeq;
+    &_tao_tc_CORBA_LongLongSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -86,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert_copy (
       _tao_any,
       CORBA::LongLongSeq::_tao_any_destructor,
-      CORBA::_tc_LongLongSeq,
+      CORBA_LongLongSeq_0,
       _tao_elem
     );
 }
@@ -100,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert (
       _tao_any,
       CORBA::LongLongSeq::_tao_any_destructor,
-      CORBA::_tc_LongLongSeq,
+      CORBA_LongLongSeq_0,
       _tao_elem
     );
 }
@@ -127,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::extract (
         _tao_any,
         CORBA::LongLongSeq::_tao_any_destructor,
-        CORBA::_tc_LongLongSeq,
+        CORBA_LongLongSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp
index fcb5bbc043a..879e75baa01 100644
--- a/TAO/tao/LongSeqA.cpp
+++ b/TAO/tao/LongSeqA.cpp
@@ -26,52 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "LongSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_LongSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4c6f), 
-  ACE_NTOHL (0x6e675365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/LongSeq:1.0
-    8,
-  ACE_NTOHL (0x4c6f6e67), 
-  ACE_NTOHL (0x53657100),  // name = LongSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_long,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_LongSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_LongSeq),
-    (char *) &_oc_CORBA_LongSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LongSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_long,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LongSeq (
+    "IDL:omg.org/CORBA/LongSeq:1.0",
+    "LongSeq",
+    &::_tao_tc_CORBA_LongSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_LongSeq =
-    &_tc_TAO_tc_CORBA_LongSeq;
+    &_tao_tc_CORBA_LongSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -84,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert_copy (
       _tao_any,
       CORBA::LongSeq::_tao_any_destructor,
-      CORBA::_tc_LongSeq,
+      CORBA_LongSeq_0,
       _tao_elem
     );
 }
@@ -98,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert (
       _tao_any,
       CORBA::LongSeq::_tao_any_destructor,
-      CORBA::_tc_LongSeq,
+      CORBA_LongSeq_0,
       _tao_elem
     );
 }
@@ -125,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::LongSeq>::extract (
         _tao_any,
         CORBA::LongSeq::_tao_any_destructor,
-        CORBA::_tc_LongSeq,
+        CORBA_LongSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index c376ddb6854..319c6a1d044 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -26,142 +26,64 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging.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/Value_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
+// be\be_visitor_typecode/value_typecode.cpp:32
 
-static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e48), 
-  ACE_NTOHL (0x6f6c6465), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
-    16,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e486f6c), 
-  ACE_NTOHL (0x64657200),  // name = ExceptionHolder
-    0, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
-    20,
-  ACE_NTOHL (0x69735f73), 
-  ACE_NTOHL (0x79737465), 
-  ACE_NTOHL (0x6d5f6578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e00),  // name = is_system_exception
-    CORBA::tk_boolean,
-
-  1, // data member visibility marker
-
-  11,
-  ACE_NTOHL (0x62797465), 
-  ACE_NTOHL (0x5f6f7264), 
-  ACE_NTOHL (0x65720000),  // name = byte_order
-    CORBA::tk_boolean,
-
-  1, // data member visibility marker
-
-  20,
-  ACE_NTOHL (0x6d617273), 
-  ACE_NTOHL (0x68616c65), 
-  ACE_NTOHL (0x645f6578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-  1, // data member visibility marker
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (
-    CORBA::tk_value,
-    sizeof (_oc_Messaging_ExceptionHolder),
-    (char *) &_oc_Messaging_ExceptionHolder,
-    0,
-    0
-  );
+static TAO::TypeCode::Value_Field<char const *> _tao_fields_Messaging_ExceptionHolder[] =
+  {
+    { "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 *,
+                            TAO::TypeCode::Value_Field<char const *> const *,
+                            CORBA::tk_value,
+                            TAO::Null_RefCount_Policy> const
+  _tao_tc_Messaging_ExceptionHolder (
+    "IDL:omg.org/Messaging/ExceptionHolder:1.0",
+    "ExceptionHolder",
+    CORBA::VM_NONE,
+    &CORBA::tk_null,
+    _tao_fields_Messaging_ExceptionHolder,
+    3);
 
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
-    &_tc_TAO_tc_Messaging_ExceptionHolder;
+    &_tao_tc_Messaging_ExceptionHolder;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_Messaging_ReplyHandler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7948), 
-  ACE_NTOHL (0x616e646c), 
-  ACE_NTOHL (0x65723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
-    13,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x7948616e), 
-  ACE_NTOHL (0x646c6572), 
-  ACE_NTOHL (0x0),  // name = ReplyHandler
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyHandler),
-    (char *) &_oc_Messaging_ReplyHandler,
-    0,
-    0
-  );
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_objref,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_ReplyHandler (
+    "IDL:omg.org/Messaging/ReplyHandler:1.0",
+    "ReplyHandler");
 
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyHandler =
-    &_tc_TAO_tc_Messaging_ReplyHandler;
+    &_tao_tc_Messaging_ReplyHandler;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/any_op_cs.cpp:57
 
@@ -221,7 +143,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object (
     CORBA::Object_ptr &_tao_elem
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
index 03a2067b733..38fbcb2ec46 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
@@ -26,791 +26,345 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_No_ImplC.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/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_Priority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-    9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Priority (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Priority),
-    (char *) &_oc_Messaging_Priority,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_Priority (
+    "IDL:omg.org/Messaging/Priority:1.0",
+    "Priority",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Priority =
-    &_tc_TAO_tc_Messaging_Priority;
+    &_tao_tc_Messaging_Priority;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RebindMode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
-    11,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e644d6f), 
-  ACE_NTOHL (0x64650000),  // name = RebindMode
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindMode (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_RebindMode),
-    (char *) &_oc_Messaging_RebindMode,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RebindMode (
+    "IDL:omg.org/Messaging/RebindMode:1.0",
+    "RebindMode",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RebindMode =
-    &_tc_TAO_tc_Messaging_RebindMode;
+    &_tao_tc_Messaging_RebindMode;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RoutingType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-    12,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706500),  // name = RoutingType
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingType (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_RoutingType),
-    (char *) &_oc_Messaging_RoutingType,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RoutingType (
+    "IDL:omg.org/Messaging/RoutingType:1.0",
+    "RoutingType",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingType =
-    &_tc_TAO_tc_Messaging_RoutingType;
+    &_tao_tc_Messaging_RoutingType;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_Ordering[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4f72), 
-  ACE_NTOHL (0x64657269), 
-  ACE_NTOHL (0x6e673a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
-    9,
-  ACE_NTOHL (0x4f726465), 
-  ACE_NTOHL (0x72696e67), 
-  ACE_NTOHL (0x0),  // name = Ordering
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Ordering (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Ordering),
-    (char *) &_oc_Messaging_Ordering,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_Ordering (
+    "IDL:omg.org/Messaging/Ordering:1.0",
+    "Ordering",
+    &::_tao_tc_CORBA::_tc_ushort);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Ordering =
-    &_tc_TAO_tc_Messaging_Ordering;
+    &_tao_tc_Messaging_Ordering;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RebindPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0
-    13,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e64506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RebindPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RebindPolicy),
-    (char *) &_oc_Messaging_RebindPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RebindPolicy (
+    "IDL:omg.org/Messaging/RebindPolicy:1.0",
+    "RebindPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RebindPolicy =
-    &_tc_TAO_tc_Messaging_RebindPolicy;
+    &_tao_tc_Messaging_RebindPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_PriorityRange[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74795261), 
-  ACE_NTOHL (0x6e67653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
-    14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x52616e67), 
-  ACE_NTOHL (0x65000000),  // name = PriorityRange
-  2, // member count
-    4,
-  ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  4,
-  ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_PriorityRange),
-    (char *) &_oc_Messaging_PriorityRange,
-    0,
-    0
-  );
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_Messaging_PriorityRange[] =
+  {
+    { "min", &Messaging::_tc_Priority },
+    { "max", &Messaging::_tc_Priority }
+    
+  };
 
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_PriorityRange (
+    "IDL:omg.org/Messaging/PriorityRange:1.0",
+    "PriorityRange",
+    _tao_fields_Messaging_PriorityRange,
+    2);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityRange =
-    &_tc_TAO_tc_Messaging_PriorityRange;
+    &_tao_tc_Messaging_PriorityRange;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0
-    22,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestPriorityPolicy),
-    (char *) &_oc_Messaging_RequestPriorityPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RequestPriorityPolicy (
+    "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0",
+    "RequestPriorityPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy =
-    &_tc_TAO_tc_Messaging_RequestPriorityPolicy;
+    &_tao_tc_Messaging_RequestPriorityPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7950), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0
-    20,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyPriorityPolicy),
-    (char *) &_oc_Messaging_ReplyPriorityPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_ReplyPriorityPolicy (
+    "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0",
+    "ReplyPriorityPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy =
-    &_tc_TAO_tc_Messaging_ReplyPriorityPolicy;
+    &_tao_tc_Messaging_ReplyPriorityPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0
-    23,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737453), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestStartTimePolicy),
-    (char *) &_oc_Messaging_RequestStartTimePolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RequestStartTimePolicy (
+    "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0",
+    "RequestStartTimePolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy =
-    &_tc_TAO_tc_Messaging_RequestStartTimePolicy;
+    &_tao_tc_Messaging_RequestStartTimePolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0
-    21,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737445), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RequestEndTimePolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestEndTimePolicy),
-    (char *) &_oc_Messaging_RequestEndTimePolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RequestEndTimePolicy (
+    "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0",
+    "RequestEndTimePolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy =
-    &_tc_TAO_tc_Messaging_RequestEndTimePolicy;
+    &_tao_tc_Messaging_RequestEndTimePolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7953), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0
-    21,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyStartTimePolicy),
-    (char *) &_oc_Messaging_ReplyStartTimePolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_ReplyStartTimePolicy (
+    "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0",
+    "ReplyStartTimePolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy =
-    &_tc_TAO_tc_Messaging_ReplyStartTimePolicy;
+    &_tao_tc_Messaging_ReplyStartTimePolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7945), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0
-    19,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyEndTimePolicy),
-    (char *) &_oc_Messaging_ReplyEndTimePolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_ReplyEndTimePolicy (
+    "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0",
+    "ReplyEndTimePolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy =
-    &_tc_TAO_tc_Messaging_ReplyEndTimePolicy;
+    &_tao_tc_Messaging_ReplyEndTimePolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x76655265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x7454696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0
-    29,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737454), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy),
-    (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RelativeRequestTimeoutPolicy (
+    "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0",
+    "RelativeRequestTimeoutPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy =
-    &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy;
+    &_tao_tc_Messaging_RelativeRequestTimeoutPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x6552616e), 
-  ACE_NTOHL (0x67653a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
-    17,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706552), 
-  ACE_NTOHL (0x616e6765), 
-  ACE_NTOHL (0x0),  // name = RoutingTypeRange
-  2, // member count
-    4,
-  ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-        12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
-    ACE_NTOHL (0x79706500),  // name = RoutingType
-        CORBA::tk_short,
-
-
-  4,
-  ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-        12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
-    ACE_NTOHL (0x79706500),  // name = RoutingType
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_RoutingTypeRange),
-    (char *) &_oc_Messaging_RoutingTypeRange,
-    0,
-    0
-  );
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_Messaging_RoutingTypeRange[] =
+  {
+    { "min", &Messaging::_tc_RoutingType },
+    { "max", &Messaging::_tc_RoutingType }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RoutingTypeRange (
+    "IDL:omg.org/Messaging/RoutingTypeRange:1.0",
+    "RoutingTypeRange",
+    _tao_fields_Messaging_RoutingTypeRange,
+    2);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange =
-    &_tc_TAO_tc_Messaging_RoutingTypeRange;
+    &_tao_tc_Messaging_RoutingTypeRange;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0
-    14,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6750), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = RoutingPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RoutingPolicy),
-    (char *) &_oc_Messaging_RoutingPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RoutingPolicy (
+    "IDL:omg.org/Messaging/RoutingPolicy:1.0",
+    "RoutingPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingPolicy =
-    &_tc_TAO_tc_Messaging_RoutingPolicy;
+    &_tao_tc_Messaging_RoutingPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4d61), 
-  ACE_NTOHL (0x78486f70), 
-  ACE_NTOHL (0x73506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0
-    14,
-  ACE_NTOHL (0x4d617848), 
-  ACE_NTOHL (0x6f707350), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_MaxHopsPolicy),
-    (char *) &_oc_Messaging_MaxHopsPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_MaxHopsPolicy (
+    "IDL:omg.org/Messaging/MaxHopsPolicy:1.0",
+    "MaxHopsPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy =
-    &_tc_TAO_tc_Messaging_MaxHopsPolicy;
+    &_tao_tc_Messaging_MaxHopsPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5175), 
-  ACE_NTOHL (0x6575654f), 
-  ACE_NTOHL (0x72646572), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0
-    17,
-  ACE_NTOHL (0x51756575), 
-  ACE_NTOHL (0x654f7264), 
-  ACE_NTOHL (0x6572506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = QueueOrderPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_QueueOrderPolicy),
-    (char *) &_oc_Messaging_QueueOrderPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_QueueOrderPolicy (
+    "IDL:omg.org/Messaging/QueueOrderPolicy:1.0",
+    "QueueOrderPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy =
-    &_tc_TAO_tc_Messaging_QueueOrderPolicy;
+    &_tao_tc_Messaging_QueueOrderPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RebindPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -820,14 +374,14 @@ TAO::Any_Impl_T<Messaging::RebindPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -937,7 +491,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -947,14 +501,14 @@ TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1006,7 +560,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1016,14 +570,14 @@ TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1075,7 +629,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1085,14 +639,14 @@ TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1144,7 +698,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1154,14 +708,14 @@ TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1213,7 +767,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1223,14 +777,14 @@ TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1282,7 +836,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1292,14 +846,14 @@ TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1351,7 +905,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1361,14 +915,14 @@ TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1478,7 +1032,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RoutingPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1488,14 +1042,14 @@ TAO::Any_Impl_T<Messaging::RoutingPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1547,7 +1101,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1557,14 +1111,14 @@ TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1616,7 +1170,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1626,14 +1180,14 @@ TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
index 06c523b0d87..bf5262c0f00 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
@@ -26,115 +26,72 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_RT_PolicyC.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/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_Messaging_Timeout[] =
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_TimeT (
+    "IDL:omg.org/TimeBase/TimeT:1.0",
+    "TimeT",
+    &::_tao_tc_CORBA::_tc_ulonglong);
+  
+namespace TimeBase
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
-    8,
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x6f757400),  // name = Timeout
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Timeout),
-    (char *) &_oc_Messaging_Timeout,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_TimeT =
+    &_tao_tc_TimeBase_TimeT;
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_Timeout (
+    "IDL:omg.org/Messaging/Timeout:1.0",
+    "Timeout",
+    &TimeBase::_tc_TimeT);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Timeout =
-    &_tc_TAO_tc_Messaging_Timeout;
+    &_tao_tc_Messaging_Timeout;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x7665526f), 
-  ACE_NTOHL (0x756e6474), 
-  ACE_NTOHL (0x72697054), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0
-    31,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x526f756e), 
-  ACE_NTOHL (0x64747269), 
-  ACE_NTOHL (0x7054696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy),
-    (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_RelativeRoundtripTimeoutPolicy (
+    "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0",
+    "RelativeRoundtripTimeoutPolicy");
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy =
-    &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy;
+    &_tao_tc_Messaging_RelativeRoundtripTimeoutPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -144,14 +101,14 @@ TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
index d56ff533736..040592b9da0 100644
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ b/TAO/tao/Messaging_PolicyValueA.cpp
@@ -26,213 +26,72 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_PolicyValueC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_PolicyValue[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-    12,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c756500),  // name = PolicyValue
-  2, // member count
-    6,
-  ACE_NTOHL (0x70747970), 
-  ACE_NTOHL (0x65000000),  // name = ptype
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x54797065), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-        11,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63795479), 
-    ACE_NTOHL (0x70650000),  // name = PolicyType
-        CORBA::tk_ulong,
-
-
-  7,
-  ACE_NTOHL (0x7076616c), 
-  ACE_NTOHL (0x75650000),  // name = pvalue
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_PolicyValue),
-    (char *) &_oc_Messaging_PolicyValue,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_Messaging_PolicyValue[] =
+  {
+    { "ptype", &CORBA::_tc_PolicyType },
+    { "pvalue", &CORBA::_tc_OctetSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_PolicyValue (
+    "IDL:omg.org/Messaging/PolicyValue:1.0",
+    "PolicyValue",
+    _tao_fields_Messaging_PolicyValue,
+    2);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyValue =
-    &_tc_TAO_tc_Messaging_PolicyValue;
+    &_tao_tc_Messaging_PolicyValue;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
-    15,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c756553), 
-  ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      38,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x4d657373), 
-      ACE_NTOHL (0x6167696e), 
-      ACE_NTOHL (0x672f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x653a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-            12,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795661), 
-      ACE_NTOHL (0x6c756500),  // name = PolicyValue
-      2, // member count
-            6,
-      ACE_NTOHL (0x70747970), 
-      ACE_NTOHL (0x65000000),  // name = ptype
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f506f), 
-        ACE_NTOHL (0x6c696379), 
-        ACE_NTOHL (0x54797065), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-                11,
-        ACE_NTOHL (0x506f6c69), 
-        ACE_NTOHL (0x63795479), 
-        ACE_NTOHL (0x70650000),  // name = PolicyType
-                CORBA::tk_ulong,
-
-
-      7,
-      ACE_NTOHL (0x7076616c), 
-      ACE_NTOHL (0x75650000),  // name = pvalue
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
 
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-    0U,
-
-};
 
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_PolicyValueSeq),
-    (char *) &_oc_Messaging_PolicyValueSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_PolicyValueSeq_0 (
+    CORBA::tk_sequence,
+    &Messaging::_tc_PolicyValue,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_PolicyValueSeq (
+    "IDL:omg.org/Messaging/PolicyValueSeq:1.0",
+    "PolicyValueSeq",
+    &::_tao_tc_Messaging_PolicyValueSeq_0);
+  
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq =
-    &_tc_TAO_tc_Messaging_PolicyValueSeq;
+    &_tao_tc_Messaging_PolicyValueSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -303,7 +162,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
       _tao_any,
       Messaging::PolicyValueSeq::_tao_any_destructor,
-      Messaging::_tc_PolicyValueSeq,
+      Messaging_PolicyValueSeq_0,
       _tao_elem
     );
 }
@@ -317,7 +176,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
       _tao_any,
       Messaging::PolicyValueSeq::_tao_any_destructor,
-      Messaging::_tc_PolicyValueSeq,
+      Messaging_PolicyValueSeq_0,
       _tao_elem
     );
 }
@@ -344,7 +203,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
         _tao_any,
         Messaging::PolicyValueSeq::_tao_any_destructor,
-        Messaging::_tc_PolicyValueSeq,
+        Messaging_PolicyValueSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff b/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff
index f6a1bcdad03..2561a42d5fb 100644
--- a/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff
+++ b/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff
@@ -1,13 +1,5 @@
---- orig/ObjectReferenceTemplateC.h	2005-02-11 14:14:38.846872000 +0100
-+++ ObjectReferenceTemplateC.h	2005-02-11 14:17:20.779720000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ObjectReferenceTemplateC.h	2005-03-25 19:44:50.584169600 +0100
++++ ObjectReferenceTemplateC.h	2005-03-25 19:44:51.054846400 +0100
 @@ -33,6 +33,9 @@
  
  #include /**/ "ace/pre.h"
@@ -18,16 +10,8 @@
  
  #include "ace/config-all.h"
  
---- orig/ObjectReferenceTemplateC.cpp	2005-02-11 14:14:38.846872000 +0100
-+++ ObjectReferenceTemplateC.cpp	2005-02-11 14:17:20.749676800 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ObjectReferenceTemplateC.cpp	2005-03-25 19:44:50.584169600 +0100
++++ ObjectReferenceTemplateC.cpp	2005-03-25 19:44:51.114932800 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -37,31 +21,14 @@
  #include "tao/CDR.h"
  #include "tao/Exception_Data.h"
  #include "tao/Invocation_Adapter.h"
-@@ -48,14 +48,14 @@
- #endif /* !defined INLINE */
- 
- // TAO_IDL - Generated from
--// be\be_visitor_arg_traits.cpp:66
-+// be\be_visitor_arg_traits.cpp:65
- 
- // Arg traits specializations.
- namespace TAO
- {
-   
-   // TAO_IDL - Generated from
--  // be\be_visitor_arg_traits.cpp:433
-+  // be\be_visitor_arg_traits.cpp:383
- 
- #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
- #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
---- orig/ObjectReferenceTemplateA.cpp	2005-02-11 14:14:38.866900800 +0100
-+++ ObjectReferenceTemplateA.cpp	2005-02-14 14:56:53.548045100 +0100
+--- orig/ObjectReferenceTemplateA.cpp	2005-03-25 19:44:50.584169600 +0100
++++ ObjectReferenceTemplateA.cpp	2005-03-25 19:45:21.758996800 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "ObjectReferenceTemplateC.h"
 +#include "ObjectReferenceTemplate.h"
- #include "tao/Typecode.h"
- #include "tao/CDR.h"
- #include "tao/Any.h"
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+ #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp
index 9f5fb8cc676..37b998dfb85 100644
--- a/TAO/tao/ObjectIdListA.cpp
+++ b/TAO/tao/ObjectIdListA.cpp
@@ -26,112 +26,77 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ObjectIdListC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_ORB_ObjectId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x425f4f62), 
-  ACE_NTOHL (0x6a656374), 
-  ACE_NTOHL (0x49643a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0
-    13,
-  ACE_NTOHL (0x4f52425f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ORB_ObjectId
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ORB_ObjectId),
-    (char *) &_oc_CORBA_ORB_ObjectId,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ORB_ObjectId (
+    "IDL:omg.org/CORBA/ORB_ObjectId:1.0",
+    "ORB_ObjectId",
+    &::_tao_tc_CORBA::_tc_string);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId =
-    &_tc_TAO_tc_CORBA_ORB_ObjectId;
+    &_tao_tc_CORBA_ORB_ObjectId;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
 
-static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ORB_ObjectId (
+    "IDL:omg.org/CORBA/ORB_ObjectId:1.0",
+    "ORB_ObjectId",
+    &::_tao_tc_CORBA::_tc_string);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x425f4f62), 
-  ACE_NTOHL (0x6a656374), 
-  ACE_NTOHL (0x49644c69), 
-  ACE_NTOHL (0x73743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectIdList:1.0
-    17,
-  ACE_NTOHL (0x4f52425f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = ORB_ObjectIdList
-    CORBA::tk_sequence, // typecode kind
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4f52), 
-      ACE_NTOHL (0x425f4f62), 
-      ACE_NTOHL (0x6a656374), 
-      ACE_NTOHL (0x49643a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0
-            13,
-      ACE_NTOHL (0x4f52425f), 
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63744964), 
-      ACE_NTOHL (0x0),  // name = ORB_ObjectId
-            CORBA::tk_string, 
-      0U, // string length
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ORB_ObjectIdList),
-    (char *) &_oc_CORBA_ORB_ObjectIdList,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId =
+    &_tao_tc_CORBA_ORB_ObjectId;
+}
 
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ORB_ObjectIdList_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_ORB_ObjectId,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ORB_ObjectIdList (
+    "IDL:omg.org/CORBA/ORB_ObjectIdList:1.0",
+    "ORB_ObjectIdList",
+    &::_tao_tc_CORBA_ORB_ObjectIdList_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList =
-    &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
+    &_tao_tc_CORBA_ORB_ObjectIdList;
 }
 
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
index dba4e5cbd20..3ccc225fc0c 100644
--- a/TAO/tao/OctetSeqA.cpp
+++ b/TAO/tao/OctetSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "OctetSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_OctetSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f63), 
-  ACE_NTOHL (0x74657453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-    9,
-  ACE_NTOHL (0x4f637465), 
-  ACE_NTOHL (0x74536571), 
-  ACE_NTOHL (0x0),  // name = OctetSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_OctetSeq),
-    (char *) &_oc_CORBA_OctetSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OctetSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_octet,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OctetSeq (
+    "IDL:omg.org/CORBA/OctetSeq:1.0",
+    "OctetSeq",
+    &::_tao_tc_CORBA_OctetSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_OctetSeq =
-    &_tc_TAO_tc_CORBA_OctetSeq;
+    &_tao_tc_CORBA_OctetSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
       _tao_any,
       CORBA::OctetSeq::_tao_any_destructor,
-      CORBA::_tc_OctetSeq,
+      CORBA_OctetSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
       _tao_any,
       CORBA::OctetSeq::_tao_any_destructor,
-      CORBA::_tc_OctetSeq,
+      CORBA_OctetSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
         _tao_any,
         CORBA::OctetSeq::_tao_any_destructor,
-        CORBA::_tc_OctetSeq,
+        CORBA_OctetSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index b27e8b54db6..3480d5407a6 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -26,164 +26,146 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PolicyC.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/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x72436f64), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794572), 
-  ACE_NTOHL (0x726f7243), 
-  ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyErrorCode),
-    (char *) &_oc_CORBA_PolicyErrorCode,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyErrorCode (
+    "IDL:omg.org/CORBA/PolicyErrorCode:1.0",
+    "PolicyErrorCode",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode =
-    &_tc_TAO_tc_CORBA_PolicyErrorCode;
+    &_tao_tc_CORBA_PolicyErrorCode;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_Policy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-    7,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = Policy
-  };
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Policy),
-    (char *) &_oc_CORBA_Policy,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_PolicyError[] =
+  {
+    { "reason", &CORBA::_tc_PolicyErrorCode }
+    
+  };
 
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyError (
+    "IDL:omg.org/CORBA/PolicyError:1.0",
+    "PolicyError",
+    _tao_fields_CORBA_PolicyError,
+    1);
+  
 namespace CORBA
 {
-  ::CORBA::TypeCode_ptr const _tc_Policy =
-    &_tc_TAO_tc_CORBA_Policy;
+  ::CORBA::TypeCode_ptr const _tc_PolicyError =
+    &_tao_tc_CORBA_PolicyError;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_PolicyManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765723a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x72000000),  // name = PolicyManager
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_InvalidPolicies[] =
+  {
+    { "indices", &CORBA::_tc_UShortSeq }
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_PolicyManager),
-    (char *) &_oc_CORBA_PolicyManager,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InvalidPolicies (
+    "IDL:omg.org/CORBA/InvalidPolicies:1.0",
+    "InvalidPolicies",
+    _tao_fields_CORBA_InvalidPolicies,
+    1);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InvalidPolicies =
+    &_tao_tc_CORBA_InvalidPolicies;
+}
+
+
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_objref,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Policy (
+    "IDL:omg.org/CORBA/Policy:1.0",
+    "Policy");
+  
 namespace CORBA
 {
-  ::CORBA::TypeCode_ptr const _tc_PolicyManager =
-    &_tc_TAO_tc_CORBA_PolicyManager;
+  ::CORBA::TypeCode_ptr const _tc_Policy =
+    &_tao_tc_CORBA_Policy;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794375), 
-  ACE_NTOHL (0x7272656e), 
-  ACE_NTOHL (0x74000000),  // name = PolicyCurrent
-  };
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyManager (
+    "IDL:omg.org/CORBA/PolicyManager:1.0",
+    "PolicyManager");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_PolicyManager =
+    &_tao_tc_CORBA_PolicyManager;
+}
+
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_PolicyCurrent),
-    (char *) &_oc_CORBA_PolicyCurrent,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyCurrent (
+    "IDL:omg.org/CORBA/PolicyCurrent:1.0",
+    "PolicyCurrent");
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyCurrent =
-    &_tc_TAO_tc_CORBA_PolicyCurrent;
+    &_tao_tc_CORBA_PolicyCurrent;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
     TAO_InputCDR & cdr
@@ -268,7 +250,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
     TAO_InputCDR & cdr
@@ -353,7 +335,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Policy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -408,7 +390,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyManager>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -418,14 +400,14 @@ TAO::Any_Impl_T<CORBA::PolicyManager>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
 {
@@ -477,7 +459,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyCurrent>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -487,14 +469,14 @@ TAO::Any_Impl_T<CORBA::PolicyCurrent>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
index 697a63c946c..e9129f89a70 100644
--- a/TAO/tao/Policy_ForwardA.cpp
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -26,218 +26,138 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Policy_ForwardC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_PolicyType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-    11,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795479), 
-  ACE_NTOHL (0x70650000),  // name = PolicyType
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyType),
-    (char *) &_oc_CORBA_PolicyType,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyType (
+    "IDL:omg.org/CORBA/PolicyType:1.0",
+    "PolicyType",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyType =
-    &_tc_TAO_tc_CORBA_PolicyType;
+    &_tao_tc_CORBA_PolicyType;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_PolicyList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
-    11,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794c69), 
-  ACE_NTOHL (0x73740000),  // name = PolicyList
-    CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      29,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-            7,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63790000),  // name = Policy
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyList),
-    (char *) &_oc_CORBA_PolicyList,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyList_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_Policy,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyList (
+    "IDL:omg.org/CORBA/PolicyList:1.0",
+    "PolicyList",
+    &::_tao_tc_CORBA_PolicyList_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyList =
-    &_tc_TAO_tc_CORBA_PolicyList;
+    &_tao_tc_CORBA_PolicyList;
 }
 
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
 
-static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyType (
+    "IDL:omg.org/CORBA/PolicyType:1.0",
+    "PolicyType",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795479), 
-  ACE_NTOHL (0x70655365), 
-  ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x54797065), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-            11,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795479), 
-      ACE_NTOHL (0x70650000),  // name = PolicyType
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyTypeSeq),
-    (char *) &_oc_CORBA_PolicyTypeSeq,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_PolicyType =
+    &_tao_tc_CORBA_PolicyType;
+}
 
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyTypeSeq_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_PolicyType,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PolicyTypeSeq (
+    "IDL:omg.org/CORBA/PolicyTypeSeq:1.0",
+    "PolicyTypeSeq",
+    &::_tao_tc_CORBA_PolicyTypeSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq =
-    &_tc_TAO_tc_CORBA_PolicyTypeSeq;
+    &_tao_tc_CORBA_PolicyTypeSeq;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
-static const CORBA::Long _oc_CORBA_SetOverrideType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x744f7665), 
-  ACE_NTOHL (0x72726964), 
-  ACE_NTOHL (0x65547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
-  16,
-  ACE_NTOHL (0x5365744f), 
-  ACE_NTOHL (0x76657272), 
-  ACE_NTOHL (0x69646554), 
-  ACE_NTOHL (0x79706500),  // name = SetOverrideType
-  2, // member count
-  13,
-  ACE_NTOHL (0x5345545f), 
-  ACE_NTOHL (0x4f564552), 
-  ACE_NTOHL (0x52494445), 
-  ACE_NTOHL (0x0),  // name = SET_OVERRIDE
-  13,
-  ACE_NTOHL (0x4144445f), 
-  ACE_NTOHL (0x4f564552), 
-  ACE_NTOHL (0x52494445), 
-  ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
+static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_SetOverrideType[] =
+  {
+    "SET_OVERRIDE",
+    "ADD_OVERRIDE"
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_SetOverrideType),
-    (char *) &_oc_CORBA_SetOverrideType,
-    0,
-    0
-  );
-
+static TAO::TypeCode::Enum<char const *,
+                           TAO::TypeCode::Enumerator<char const *> const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_SetOverrideType (
+    "IDL:omg.org/CORBA/SetOverrideType:1.0",
+    "SetOverrideType",
+    _tao_enumerators_CORBA_SetOverrideType,
+    2);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_SetOverrideType =
-    &_tc_TAO_tc_CORBA_SetOverrideType;
+    &_tao_tc_CORBA_SetOverrideType;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -250,7 +170,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
       _tao_any,
       CORBA::PolicyList::_tao_any_destructor,
-      CORBA::_tc_PolicyList,
+      CORBA_PolicyList_0,
       _tao_elem
     );
 }
@@ -264,7 +184,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
       _tao_any,
       CORBA::PolicyList::_tao_any_destructor,
-      CORBA::_tc_PolicyList,
+      CORBA_PolicyList_0,
       _tao_elem
     );
 }
@@ -291,7 +211,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
         _tao_any,
         CORBA::PolicyList::_tao_any_destructor,
-        CORBA::_tc_PolicyList,
+        CORBA_PolicyList_0,
         _tao_elem
       );
 }
@@ -308,7 +228,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
       _tao_any,
       CORBA::PolicyTypeSeq::_tao_any_destructor,
-      CORBA::_tc_PolicyTypeSeq,
+      CORBA_PolicyTypeSeq_0,
       _tao_elem
     );
 }
@@ -322,7 +242,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
       _tao_any,
       CORBA::PolicyTypeSeq::_tao_any_destructor,
-      CORBA::_tc_PolicyTypeSeq,
+      CORBA_PolicyTypeSeq_0,
       _tao_elem
     );
 }
@@ -349,7 +269,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
         _tao_any,
         CORBA::PolicyTypeSeq::_tao_any_destructor,
-        CORBA::_tc_PolicyTypeSeq,
+        CORBA_PolicyTypeSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index aef097b508f..eed331d7697 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -26,553 +26,347 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableInterceptorC.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/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f723a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
-    12,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f7200),  // name = Interceptor
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_Interceptor),
-    (char *) &_oc_PortableInterceptor_Interceptor,
-    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_PortableInterceptor_Interceptor (
+    "IDL:omg.org/PortableInterceptor/Interceptor:1.0",
+    "Interceptor");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Interceptor =
-    &_tc_TAO_tc_PortableInterceptor_Interceptor;
+    &_tao_tc_PortableInterceptor_Interceptor;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x7475733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
-    12,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x74757300),  // name = ReplyStatus
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ReplyStatus),
-    (char *) &_oc_PortableInterceptor_ReplyStatus,
-    0,
-    0
-  );
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
+  {
+    { "forward", &CORBA::_tc_Object },
+    { "permanent", &CORBA::_tc_boolean }
+    
+  };
 
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ForwardRequest (
+    "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
+    "ForwardRequest",
+    _tao_fields_PortableInterceptor_ForwardRequest,
+    2);
+  
 namespace PortableInterceptor
 {
-  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
-    &_tc_TAO_tc_PortableInterceptor_ReplyStatus;
+  ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
+    &_tao_tc_PortableInterceptor_ForwardRequest;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49643a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
-    7,
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49640000),  // name = SlotId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_SlotId),
-    (char *) &_oc_PortableInterceptor_SlotId,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ReplyStatus (
+    "IDL:omg.org/PortableInterceptor/ReplyStatus:1.0",
+    "ReplyStatus",
+    &::_tao_tc_CORBA::_tc_short);
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
+    &_tao_tc_PortableInterceptor_ReplyStatus;
+}
+
+
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_SlotId (
+    "IDL:omg.org/PortableInterceptor/SlotId:1.0",
+    "SlotId",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_SlotId =
-    &_tc_TAO_tc_PortableInterceptor_SlotId;
+    &_tao_tc_PortableInterceptor_SlotId;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableInterceptor_InvalidSlot[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_Current),
-    (char *) &_oc_PortableInterceptor_Current,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_InvalidSlot (
+    "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
+    "InvalidSlot",
+    _tao_fields_PortableInterceptor_InvalidSlot,
+    0);
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_InvalidSlot =
+    &_tao_tc_PortableInterceptor_InvalidSlot;
+}
+
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_Current (
+    "IDL:omg.org/PortableInterceptor/Current:1.0",
+    "Current");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tc_TAO_tc_PortableInterceptor_Current;
+    &_tao_tc_PortableInterceptor_Current;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737449), 
-  ACE_NTOHL (0x6e666f3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
-    12,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737449), 
-  ACE_NTOHL (0x6e666f00),  // name = RequestInfo
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_RequestInfo),
-    (char *) &_oc_PortableInterceptor_RequestInfo,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_RequestInfo (
+    "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
+    "RequestInfo");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_RequestInfo =
-    &_tc_TAO_tc_PortableInterceptor_RequestInfo;
+    &_tao_tc_PortableInterceptor_RequestInfo;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
-    18,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ClientRequestInfo),
-    (char *) &_oc_PortableInterceptor_ClientRequestInfo,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ClientRequestInfo (
+    "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
+    "ClientRequestInfo");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
-    &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo;
+    &_tao_tc_PortableInterceptor_ClientRequestInfo;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
-    18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ServerRequestInfo),
-    (char *) &_oc_PortableInterceptor_ServerRequestInfo,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ServerRequestInfo (
+    "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
+    "ServerRequestInfo");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
-    &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo;
+    &_tao_tc_PortableInterceptor_ServerRequestInfo;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
-    25,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ClientRequestInterceptor),
-    (char *) &_oc_PortableInterceptor_ClientRequestInterceptor,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ClientRequestInterceptor (
+    "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0",
+    "ClientRequestInterceptor");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor =
-    &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor;
+    &_tao_tc_PortableInterceptor_ClientRequestInterceptor;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
-    25,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ServerRequestInterceptor),
-    (char *) &_oc_PortableInterceptor_ServerRequestInterceptor,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ServerRequestInterceptor (
+    "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
+    "ServerRequestInterceptor");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
-    &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor;
+    &_tao_tc_PortableInterceptor_ServerRequestInterceptor;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x79000000),  // name = PolicyFactory
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_PolicyFactory),
-    (char *) &_oc_PortableInterceptor_PolicyFactory,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_PolicyFactory (
+    "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
+    "PolicyFactory");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
-    &_tc_TAO_tc_PortableInterceptor_PolicyFactory;
+    &_tao_tc_PortableInterceptor_PolicyFactory;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
-    9,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId),
-    (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId,
-    0,
-    0
-  );
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId (
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
+    "ObjectId",
+    &::_tao_tc_CORBA::_tc_string);
+  
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
-  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
+  &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
-    12,
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
+  {
+    { "name", &CORBA::_tc_string }
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ORBInitInfo),
-    (char *) &_oc_PortableInterceptor_ORBInitInfo,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+    "DuplicateName",
+    _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
+    1);
+  
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName (
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+    "InvalidName",
+    _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo (
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
+    "ORBInitInfo");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
-    &_tc_TAO_tc_PortableInterceptor_ORBInitInfo;
+    &_tao_tc_PortableInterceptor_ORBInitInfo;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
-    15,
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65720000),  // name = ORBInitializer
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ORBInitializer),
-    (char *) &_oc_PortableInterceptor_ORBInitializer,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitializer (
+    "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
+    "ORBInitializer");
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
-    &_tc_TAO_tc_PortableInterceptor_ORBInitializer;
+    &_tao_tc_PortableInterceptor_ORBInitializer;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Interceptor>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -582,14 +376,14 @@ TAO::Any_Impl_T<PortableInterceptor::Interceptor>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
 {
@@ -641,7 +435,7 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
     TAO_InputCDR & cdr
@@ -726,7 +520,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
     TAO_InputCDR & cdr
@@ -811,7 +605,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Current>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -821,14 +615,14 @@ TAO::Any_Impl_T<PortableInterceptor::Current>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
 {
@@ -880,7 +674,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -890,14 +684,14 @@ TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
 {
@@ -949,7 +743,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -959,14 +753,14 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
 {
@@ -1018,7 +812,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1028,14 +822,14 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
 {
@@ -1087,7 +881,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1097,14 +891,14 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
 {
@@ -1156,7 +950,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1166,14 +960,14 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
 {
@@ -1225,7 +1019,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1235,14 +1029,14 @@ TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
 {
@@ -1294,7 +1088,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1304,14 +1098,14 @@ TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
 {
@@ -1363,14 +1157,14 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
 {
@@ -1435,14 +1229,14 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
 {
@@ -1507,7 +1301,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1517,14 +1311,14 @@ TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp
index 81c02608af0..8e0de1c7060 100644
--- a/TAO/tao/PortableServer/POAManagerA.cpp
+++ b/TAO/tao/PortableServer/POAManagerA.cpp
@@ -26,7 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "POAManagerC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -34,97 +40,72 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static const CORBA::Long _oc_PortableServer_POAManager_State[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x722f5374), 
-  ACE_NTOHL (0x6174653a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POAManager/State:2.3
-  6,
-  ACE_NTOHL (0x53746174), 
-  ACE_NTOHL (0x65000000),  // name = State
-  4, // member count
-  8,
-  ACE_NTOHL (0x484f4c44), 
-  ACE_NTOHL (0x494e4700),  // name = HOLDING
-  7,
-  ACE_NTOHL (0x41435449), 
-  ACE_NTOHL (0x56450000),  // name = ACTIVE
-  11,
-  ACE_NTOHL (0x44495343), 
-  ACE_NTOHL (0x41524449), 
-  ACE_NTOHL (0x4e470000),  // name = DISCARDING
-  9,
-  ACE_NTOHL (0x494e4143), 
-  ACE_NTOHL (0x54495645), 
-  ACE_NTOHL (0x0),  // name = INACTIVE
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POAManager_AdapterInactive[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_State (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_POAManager_State),
-    (char *) &_oc_PortableServer_POAManager_State,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
-  &_tc_TAO_tc_PortableServer_POAManager_State;
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager_AdapterInactive (
+    "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
+    "AdapterInactive",
+    _tao_fields_PortableServer_POAManager_AdapterInactive,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
+  &_tao_tc_PortableServer_POAManager_AdapterInactive;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POAManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x723a322e), 
-  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
-    11,
-  ACE_NTOHL (0x504f414d), 
-  ACE_NTOHL (0x616e6167), 
-  ACE_NTOHL (0x65720000),  // name = POAManager
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_POAManager_State[] =
+  {
+    "HOLDING",
+    "ACTIVE",
+    "DISCARDING",
+    "INACTIVE"
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_POAManager),
-    (char *) &_oc_PortableServer_POAManager,
-    0,
-    0
-  );
+static TAO::TypeCode::Enum<char const *,
+                           TAO::TypeCode::Enumerator<char const *> const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager_State (
+    "IDL:omg.org/PortableServer/POAManager/State:2.3",
+    "State",
+    _tao_enumerators_PortableServer_POAManager_State,
+    4);
+  
+::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
+  &_tao_tc_PortableServer_POAManager_State;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager (
+    "IDL:omg.org/PortableServer/POAManager:2.3",
+    "POAManager");
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POAManager =
-    &_tc_TAO_tc_PortableServer_POAManager;
+    &_tao_tc_PortableServer_POAManager;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POAManager>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -134,14 +115,14 @@ TAO::Any_Impl_T<PortableServer::POAManager>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
 {
@@ -193,14 +174,14 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
index 65837676b28..8f8540e003c 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -31,7 +31,13 @@
 
 #include "POAManagerC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -177,52 +183,11 @@ void PortableServer::POAManager::AdapterInactive::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_tao_type (void) const
 {
   return ::PortableServer::POAManager::_tc_AdapterInactive;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  58,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x722f4164), 
-  ACE_NTOHL (0x61707465), 
-  ACE_NTOHL (0x72496e61), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x653a322e), 
-  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
-    16,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657249), 
-  ACE_NTOHL (0x6e616374), 
-  ACE_NTOHL (0x69766500),  // name = AdapterInactive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POAManager_AdapterInactive),
-    (char *) &_oc_PortableServer_POAManager_AdapterInactive,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
-  &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive;
-
 PortableServer::POAManager::POAManager (void)
 {}
 
@@ -329,7 +294,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 06900210d7d..08871400c04 100644
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -183,7 +183,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -360,7 +360,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAMan
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "POAManagerC.inl"
diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp
index eb4f76020b6..d01128ad6bf 100644
--- a/TAO/tao/PortableServer/PS_CurrentA.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentA.cpp
@@ -26,52 +26,59 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PS_CurrentC.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/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static const CORBA::Long _oc_PortableServer_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f43), 
-  ACE_NTOHL (0x75727265), 
-  ACE_NTOHL (0x6e743a32), 
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_Current_NoContext[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_Current),
-    (char *) &_oc_PortableServer_Current,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_Current_NoContext (
+    "IDL:omg.org/PortableServer/Current/NoContext:2.3",
+    "NoContext",
+    _tao_fields_PortableServer_Current_NoContext,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
+  &_tao_tc_PortableServer_Current_NoContext;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_Current (
+    "IDL:omg.org/PortableServer/Current:2.3",
+    "Current");
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tc_TAO_tc_PortableServer_Current;
+    &_tao_tc_PortableServer_Current;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::Current>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -81,14 +88,14 @@ TAO::Any_Impl_T<PortableServer::Current>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
 {
@@ -140,14 +147,14 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp
index 0c7da8bc0b0..417b4a65818 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentC.cpp
@@ -31,7 +31,11 @@
 
 #include "PS_CurrentC.h"
 #include "tao/CDR.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/Struct_TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -177,49 +181,11 @@ void PortableServer::Current::NoContext::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::Current::NoContext::_type (void) const
+CORBA::TypeCode_ptr PortableServer::Current::NoContext::_tao_type (void) const
 {
   return ::PortableServer::Current::_tc_NoContext;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f43), 
-  ACE_NTOHL (0x75727265), 
-  ACE_NTOHL (0x6e742f4e), 
-  ACE_NTOHL (0x6f436f6e), 
-  ACE_NTOHL (0x74657874), 
-  ACE_NTOHL (0x3a322e33), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
-    10,
-  ACE_NTOHL (0x4e6f436f), 
-  ACE_NTOHL (0x6e746578), 
-  ACE_NTOHL (0x74000000),  // name = NoContext
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_Current_NoContext),
-    (char *) &_oc_PortableServer_Current_NoContext,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
-  &_tc_TAO_tc_PortableServer_Current_NoContext;
-
 PortableServer::Current::Current (void)
 {}
 
@@ -330,7 +296,7 @@ PortableServer::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h
index 60c7ef9f274..8ff3bba4e12 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.h
+++ b/TAO/tao/PortableServer/PS_CurrentC.h
@@ -186,7 +186,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -310,7 +310,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "PS_CurrentC.inl"
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index 259af27f302..7b0e4c2e800 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -26,71 +26,59 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PS_ForwardC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_PortableServer_ObjectId[] =
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_sequence_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_octet,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OctetSeq (
+    "IDL:omg.org/CORBA/OctetSeq:1.0",
+    "OctetSeq",
+    &::_tao_tc_CORBA_sequence_0);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f4f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x7449643a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
-    9,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableServer_ObjectId),
-    (char *) &_oc_PortableServer_ObjectId,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_OctetSeq =
+    &_tao_tc_CORBA_OctetSeq;
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_ObjectId (
+    "IDL:omg.org/PortableServer/ObjectId:2.3",
+    "ObjectId",
+    &CORBA::_tc_OctetSeq);
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectId =
-    &_tc_TAO_tc_PortableServer_ObjectId;
+    &_tao_tc_PortableServer_ObjectId;
 }
 
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
index 2be16bb477c..d65eb0a655c 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index b6451f6ba44..3f2df5fdd7d 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -137,7 +137,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "PS_ForwardC.inl"
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 9f3c91d8ca6..16bf7cc37f9 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -26,88 +26,277 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServer.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/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POAList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f414c69),
-  ACE_NTOHL (0x73743a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POAList:1.0
-    8,
-  ACE_NTOHL (0x504f414c),
-  ACE_NTOHL (0x69737400),  // name = POAList
-    CORBA::tk_sequence, // typecode kind
-  8, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableServer_POAList),
-    (char *) &_oc_PortableServer_POAList,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAList_0 (
+    CORBA::tk_sequence,
+    &PortableServer::_tc_POA,
+    0U);
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAList (
+    "IDL:omg.org/PortableServer/POAList:1.0",
+    "POAList",
+    &::_tao_tc_PortableServer_POAList_0);
 
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POAList =
-    &_tc_TAO_tc_PortableServer_POAList;
+    &_tao_tc_PortableServer_POAList;
 }
 
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_AdapterAlreadyExists[] =
+  {
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_AdapterAlreadyExists (
+    "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3",
+    "AdapterAlreadyExists",
+    _tao_fields_PortableServer_POA_AdapterAlreadyExists,
+    0);
+
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists =
+  &_tao_tc_PortableServer_POA_AdapterAlreadyExists;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_AdapterNonExistent[] =
+  {
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_AdapterNonExistent (
+    "IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3",
+    "AdapterNonExistent",
+    _tao_fields_PortableServer_POA_AdapterNonExistent,
+    0);
+
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent =
+  &_tao_tc_PortableServer_POA_AdapterNonExistent;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_InvalidPolicy[] =
+  {
+    { "index", &CORBA::_tc_ushort }
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_InvalidPolicy (
+    "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
+    "InvalidPolicy",
+    _tao_fields_PortableServer_POA_InvalidPolicy,
+    1);
+
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy =
+  &_tao_tc_PortableServer_POA_InvalidPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_NoServant[] =
+  {
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_NoServant (
+    "IDL:omg.org/PortableServer/POA/NoServant:2.3",
+    "NoServant",
+    _tao_fields_PortableServer_POA_NoServant,
+    0);
+
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
+  &_tao_tc_PortableServer_POA_NoServant;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_ObjectAlreadyActive[] =
+  {
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_ObjectAlreadyActive (
+    "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3",
+    "ObjectAlreadyActive",
+    _tao_fields_PortableServer_POA_ObjectAlreadyActive,
+    0);
+
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive =
+  &_tao_tc_PortableServer_POA_ObjectAlreadyActive;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_ObjectNotActive[] =
+  {
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_ObjectNotActive (
+    "IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3",
+    "ObjectNotActive",
+    _tao_fields_PortableServer_POA_ObjectNotActive,
+    0);
+
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive =
+  &_tao_tc_PortableServer_POA_ObjectNotActive;
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f413a32),
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
-    4,
-  ACE_NTOHL (0x504f4100),  // name = POA
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_ServantAlreadyActive[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_ServantAlreadyActive (
+    "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3",
+    "ServantAlreadyActive",
+    _tao_fields_PortableServer_POA_ServantAlreadyActive,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive =
+  &_tao_tc_PortableServer_POA_ServantAlreadyActive;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_ServantNotActive[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_POA),
-    (char *) &_oc_PortableServer_POA,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_ServantNotActive (
+    "IDL:omg.org/PortableServer/POA/ServantNotActive:2.3",
+    "ServantNotActive",
+    _tao_fields_PortableServer_POA_ServantNotActive,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive =
+  &_tao_tc_PortableServer_POA_ServantNotActive;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_WrongAdapter[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_WrongAdapter (
+    "IDL:omg.org/PortableServer/POA/WrongAdapter:2.3",
+    "WrongAdapter",
+    _tao_fields_PortableServer_POA_WrongAdapter,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter =
+  &_tao_tc_PortableServer_POA_WrongAdapter;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_WrongPolicy[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA_WrongPolicy (
+    "IDL:omg.org/PortableServer/POA/WrongPolicy:2.3",
+    "WrongPolicy",
+    _tao_fields_PortableServer_POA_WrongPolicy,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy =
+  &_tao_tc_PortableServer_POA_WrongPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POA (
+    "IDL:omg.org/PortableServer/POA:2.3",
+    "POA");
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POA =
-    &_tc_TAO_tc_PortableServer_POA;
+    &_tao_tc_PortableServer_POA;
 }
 
-// TAO_IDL - Generated from
+
+
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -119,6 +308,8 @@ TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
   return false;
 }
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
@@ -133,7 +324,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert_copy (
       _tao_any,
       PortableServer::POAList::_tao_any_destructor,
-      PortableServer::_tc_POAList,
+      PortableServer_POAList_0,
       _tao_elem
     );
 }
@@ -147,7 +338,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert (
       _tao_any,
       PortableServer::POAList::_tao_any_destructor,
-      PortableServer::_tc_POAList,
+      PortableServer_POAList_0,
       _tao_elem
     );
 }
@@ -174,7 +365,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<PortableServer::POAList>::extract (
         _tao_any,
         PortableServer::POAList::_tao_any_destructor,
-        PortableServer::_tc_POAList,
+        PortableServer_POAList_0,
         _tao_elem
       );
 }
@@ -182,7 +373,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POA>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -192,14 +383,14 @@ TAO::Any_Impl_T<PortableServer::POA>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
 {
@@ -248,17 +439,19 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::demarshal_value (TAO_InputCDR &)
 {
@@ -320,17 +513,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::demarshal_value (TAO_InputCDR &)
 {
@@ -392,17 +585,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -464,19 +657,17 @@ 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)
-
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::demarshal_value (TAO_InputCDR &)
 {
@@ -538,19 +729,17 @@ 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
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::demarshal_value (TAO_InputCDR &)
 {
@@ -612,17 +801,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::demarshal_value (TAO_InputCDR &)
 {
@@ -684,17 +873,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::demarshal_value (TAO_InputCDR &)
 {
@@ -756,17 +945,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::demarshal_value (TAO_InputCDR &)
 {
@@ -828,17 +1017,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::demarshal_value (TAO_InputCDR &)
 {
@@ -900,17 +1089,17 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1104,4 +1293,4 @@ CORBA::Boolean operator>>= (
         PortableServer::POAList \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 32ff0cc849d..4f9c06a0b02 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -32,7 +32,13 @@
 #include "PortableServer.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.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/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/Object_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
@@ -250,53 +256,11 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_AdapterAlreadyExists;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f41), 
-  ACE_NTOHL (0x64617074), 
-  ACE_NTOHL (0x6572416c), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x79457869), 
-  ACE_NTOHL (0x7374733a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3
-    21,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657241), 
-  ACE_NTOHL (0x6c726561), 
-  ACE_NTOHL (0x64794578), 
-  ACE_NTOHL (0x69737473), 
-  ACE_NTOHL (0x0),  // name = AdapterAlreadyExists
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
-    (char *) &_oc_PortableServer_POA_AdapterAlreadyExists,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists =
-  &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -387,52 +351,11 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_AdapterNonExistent;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f41), 
-  ACE_NTOHL (0x64617074), 
-  ACE_NTOHL (0x65724e6f), 
-  ACE_NTOHL (0x6e457869), 
-  ACE_NTOHL (0x7374656e), 
-  ACE_NTOHL (0x743a322e), 
-  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3
-    19,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724e), 
-  ACE_NTOHL (0x6f6e4578), 
-  ACE_NTOHL (0x69737465), 
-  ACE_NTOHL (0x6e740000),  // name = AdapterNonExistent
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_AdapterNonExistent),
-    (char *) &_oc_PortableServer_POA_AdapterNonExistent,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent =
-  &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -541,55 +464,11 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_InvalidPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f49), 
-  ACE_NTOHL (0x6e76616c), 
-  ACE_NTOHL (0x6964506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a322e33), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
-    14,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = InvalidPolicy
-  1, // member count
-    6,
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x78000000),  // name = index
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_InvalidPolicy),
-    (char *) &_oc_PortableServer_POA_InvalidPolicy,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy =
-  &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -682,48 +561,11 @@ void PortableServer::POA::NoServant::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::NoServant::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::NoServant::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_NoServant;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f4e), 
-  ACE_NTOHL (0x6f536572), 
-  ACE_NTOHL (0x76616e74), 
-  ACE_NTOHL (0x3a322e33), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
-    10,
-  ACE_NTOHL (0x4e6f5365), 
-  ACE_NTOHL (0x7276616e), 
-  ACE_NTOHL (0x74000000),  // name = NoServant
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_NoServant),
-    (char *) &_oc_PortableServer_POA_NoServant,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
-  &_tc_TAO_tc_PortableServer_POA_NoServant;
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from 
@@ -816,52 +658,11 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_ObjectAlreadyActive;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f4f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x74416c72), 
-  ACE_NTOHL (0x65616479), 
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76653a32), 
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3
-    20,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x6374416c), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x79416374), 
-  ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
-    (char *) &_oc_PortableServer_POA_ObjectAlreadyActive,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive =
-  &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -952,50 +753,11 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_ObjectNotActive;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f4f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x744e6f74), 
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76653a32), 
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
-    16,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744e6f), 
-  ACE_NTOHL (0x74416374), 
-  ACE_NTOHL (0x69766500),  // name = ObjectNotActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ObjectNotActive),
-    (char *) &_oc_PortableServer_POA_ObjectNotActive,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive =
-  &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1086,53 +848,11 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_ServantAlreadyActive;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e74416c), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x79416374), 
-  ACE_NTOHL (0x6976653a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3
-    21,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e7441), 
-  ACE_NTOHL (0x6c726561), 
-  ACE_NTOHL (0x64794163), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x0),  // name = ServantAlreadyActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
-    (char *) &_oc_PortableServer_POA_ServantAlreadyActive,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive =
-  &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1223,51 +943,11 @@ void PortableServer::POA::ServantNotActive::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_ServantNotActive;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  52,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e744e6f), 
-  ACE_NTOHL (0x74416374), 
-  ACE_NTOHL (0x6976653a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:2.3
-    17,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e744e), 
-  ACE_NTOHL (0x6f744163), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x0),  // name = ServantNotActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ServantNotActive),
-    (char *) &_oc_PortableServer_POA_ServantNotActive,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive =
-  &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1358,49 +1038,11 @@ void PortableServer::POA::WrongAdapter::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_WrongAdapter;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f57), 
-  ACE_NTOHL (0x726f6e67), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465723a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
-    13,
-  ACE_NTOHL (0x57726f6e), 
-  ACE_NTOHL (0x67416461), 
-  ACE_NTOHL (0x70746572), 
-  ACE_NTOHL (0x0),  // name = WrongAdapter
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_WrongAdapter),
-    (char *) &_oc_PortableServer_POA_WrongAdapter,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter =
-  &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1491,48 +1133,11 @@ void PortableServer::POA::WrongPolicy::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_type (void) const
+CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_tao_type (void) const
 {
   return ::PortableServer::POA::_tc_WrongPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f57), 
-  ACE_NTOHL (0x726f6e67), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a32), 
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
-    12,
-  ACE_NTOHL (0x57726f6e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x69637900),  // name = WrongPolicy
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_WrongPolicy),
-    (char *) &_oc_PortableServer_POA_WrongPolicy,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy =
-  &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
-
 PortableServer::POA::POA (void)
 {}
 
@@ -1639,7 +1244,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 7f75b4765e9..8561dea5ceb 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -366,7 +366,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -416,7 +416,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -474,7 +474,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -526,7 +526,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -578,7 +578,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -628,7 +628,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -678,7 +678,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -728,7 +728,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -778,7 +778,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -828,7 +828,7 @@ namespace PortableServer
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -1399,7 +1399,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.inl"
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
index d159df57b53..2b70f0212cc 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
@@ -26,126 +26,65 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RequestProcessingPolicyC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_RequestProcessingPolicyValue[] =
+  {
+    "USE_ACTIVE_OBJECT_MAP_ONLY",
+    "USE_DEFAULT_SERVANT",
+    "USE_SERVANT_MANAGER"
 
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f52), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73745072), 
-  ACE_NTOHL (0x6f636573), 
-  ACE_NTOHL (0x73696e67), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c75653a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:2.3
-  29,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x726f6365), 
-  ACE_NTOHL (0x7373696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
-  3, // member count
-  27,
-  ACE_NTOHL (0x5553455f), 
-  ACE_NTOHL (0x41435449), 
-  ACE_NTOHL (0x56455f4f), 
-  ACE_NTOHL (0x424a4543), 
-  ACE_NTOHL (0x545f4d41), 
-  ACE_NTOHL (0x505f4f4e), 
-  ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
-  20,
-  ACE_NTOHL (0x5553455f), 
-  ACE_NTOHL (0x44454641), 
-  ACE_NTOHL (0x554c545f), 
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
-  20,
-  ACE_NTOHL (0x5553455f), 
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x414e545f), 
-  ACE_NTOHL (0x4d414e41), 
-  ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
-    (char *) &_oc_PortableServer_RequestProcessingPolicyValue,
-    0,
-    0
-  );
+static TAO::TypeCode::Enum<char const *,
+                           TAO::TypeCode::Enumerator<char const *> const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_RequestProcessingPolicyValue (
+    "IDL:omg.org/PortableServer/RequestProcessingPolicyValue:2.3",
+    "RequestProcessingPolicyValue",
+    _tao_enumerators_PortableServer_RequestProcessingPolicyValue,
+    3);
 
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue =
-    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue;
+    &_tao_tc_PortableServer_RequestProcessingPolicyValue;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-#if (TAO_HAS_MINIMUM_POA == 0)
 
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f52), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73745072), 
-  ACE_NTOHL (0x6f636573), 
-  ACE_NTOHL (0x73696e67), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a32), 
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3
-    24,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x726f6365), 
-  ACE_NTOHL (0x7373696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy
-  };
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_RequestProcessingPolicy),
-    (char *) &_oc_PortableServer_RequestProcessingPolicy,
-    0,
-    0
-  );
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_RequestProcessingPolicy (
+    "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3",
+    "RequestProcessingPolicy");
 
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy =
-    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy;
+    &_tao_tc_PortableServer_RequestProcessingPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_enum/any_op_cs.cpp:52
 
@@ -170,14 +109,14 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_RequestProcessingPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -187,14 +126,14 @@ TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
index 674bb549c81..f0c633a6868 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -200,27 +200,26 @@ PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_cs.cpp:51
 
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::RequestProcessingPolicyValue _tao_enumerator)
 {
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
+  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
 }
 
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessingPolicyValue & _tao_enumerator)
 {
   CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  CORBA::Boolean const _tao_success = strm >> _tao_temp;
   
-  if (_tao_result == 1)
+  if (_tao_success)
     {
-      _tao_enumval = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp);
+      _tao_enumerator = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp);
     }
   
-  return _tao_result;
+  return _tao_success;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
index 07a3bb34434..67c5ae89cfa 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
@@ -276,13 +276,13 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 // TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RequestProcessingPolicyC.inl"
diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
index 2c32b987182..b16f357f65c 100644
--- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff
+++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
@@ -1,5 +1,5 @@
---- orig/AdapterActivatorC.h	2005-02-22 14:55:26.741169600 +0100
-+++ AdapterActivatorC.h	2005-02-22 14:56:54.000000000 +0100
+--- orig/AdapterActivatorC.h	2005-03-25 15:45:52.076408000 +0100
++++ AdapterActivatorC.h	2005-03-25 15:48:48.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -24,10 +24,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+ // be\be_codegen.cpp:969
  
---- orig/AdapterActivatorC.cpp	2005-02-22 14:55:26.741169600 +0100
-+++ AdapterActivatorC.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/AdapterActivatorC.cpp	2005-03-25 15:45:52.076408000 +0100
++++ AdapterActivatorC.cpp	2005-03-25 15:48:48.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -51,8 +51,8 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/AdapterActivatorA.cpp	2005-02-22 14:55:26.741169600 +0100
-+++ AdapterActivatorA.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/AdapterActivatorA.cpp	2005-03-25 15:45:52.126480000 +0100
++++ AdapterActivatorA.cpp	2005-03-25 15:48:48.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -61,16 +61,16 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -34,6 +34,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+@@ -35,6 +35,8 @@
+ #include "tao/Any.h"
+ #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -156,3 +158,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/objref_typecode.cpp:73
+ 
+@@ -137,3 +139,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
index 3c50f1eb672..0b3aaf6c251 100644
--- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff
+++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
@@ -1,5 +1,5 @@
---- orig/ForwardRequestC.h	2005-02-22 14:55:30.326324800 +0100
-+++ ForwardRequestC.h	2005-02-22 14:56:54.000000000 +0100
+--- orig/ForwardRequestC.h	2005-03-25 15:46:10.002184000 +0100
++++ ForwardRequestC.h	2005-03-25 15:49:50.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -19,15 +19,15 @@
  
 @@ -160,6 +162,8 @@
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+ // be\be_codegen.cpp:969
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  #if defined (__ACE_INLINE__)
  #include "ForwardRequestC.inl"
  #endif /* defined INLINE */
---- orig/ForwardRequestC.cpp	2005-02-22 14:55:30.326324800 +0100
-+++ ForwardRequestC.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ForwardRequestC.cpp	2005-03-25 15:46:10.002184000 +0100
++++ ForwardRequestC.cpp	2005-03-25 15:49:50.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -36,7 +36,7 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -43,6 +43,8 @@
+@@ -46,6 +46,8 @@
  #include "ForwardRequestC.inl"
  #endif /* !defined INLINE */
  
@@ -45,14 +45,14 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
  
-@@ -279,3 +281,5 @@
+@@ -219,3 +221,5 @@
  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ForwardRequestA.cpp	2005-02-22 14:55:30.326324800 +0100
-+++ ForwardRequestA.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ForwardRequestA.cpp	2005-03-25 15:46:10.002184000 +0100
++++ ForwardRequestA.cpp	2005-03-25 15:49:50.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -61,16 +61,16 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -31,6 +31,8 @@
- #include "tao/Any.h"
- #include "tao/Any_Dual_Impl_T.h"
+@@ -61,6 +61,8 @@
+ 
+ 
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/any_op_cs.cpp:50
  
-@@ -131,3 +133,5 @@
+@@ -161,3 +163,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
index afc5386a2fd..b910af0f974 100644
--- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
@@ -1,5 +1,5 @@
---- orig/ImplicitActivationPolicyC.h	2005-02-22 14:55:27.502264000 +0100
-+++ ImplicitActivationPolicyC.h	2005-02-22 14:56:54.000000000 +0100
+--- orig/ImplicitActivationPolicyC.h	2005-03-25 15:45:54.169417600 +0100
++++ ImplicitActivationPolicyC.h	2005-03-25 15:55:03.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -31,16 +31,16 @@
  namespace TAO
  {
 @@ -275,6 +278,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+ // be\be_codegen.cpp:969
  
---- orig/ImplicitActivationPolicyC.cpp	2005-02-22 14:55:27.502264000 +0100
-+++ ImplicitActivationPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ImplicitActivationPolicyC.cpp	2005-03-25 15:45:54.159403200 +0100
++++ ImplicitActivationPolicyC.cpp	2005-03-25 15:55:03.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -58,14 +58,14 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ImplicitActivationPolicyA.cpp	2005-02-22 14:55:27.502264000 +0100
-+++ ImplicitActivationPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ImplicitActivationPolicyA.cpp	2005-03-25 15:45:54.169417600 +0100
++++ ImplicitActivationPolicyA.cpp	2005-03-25 15:55:03.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -74,16 +74,16 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -35,6 +35,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -261,3 +263,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -204,3 +206,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff
index 6d379d4b500..2d1b8a32d49 100644
--- a/TAO/tao/PortableServer/diffs/POAManager.diff
+++ b/TAO/tao/PortableServer/diffs/POAManager.diff
@@ -1,13 +1,5 @@
---- orig/POAManagerC.h	2005-02-22 14:55:27.992969600 +0100
-+++ POAManagerC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/POAManagerC.h	2005-03-25 15:45:59.657308800 +0100
++++ POAManagerC.h	2005-03-25 15:46:16.331284800 +0100
 @@ -225,6 +225,8 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff
index a10ebdf9468..3729d4ad123 100644
--- a/TAO/tao/PortableServer/diffs/PS_Forward.diff
+++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff
@@ -1,13 +1,5 @@
---- orig/PS_ForwardC.h	2005-02-22 14:55:29.024452800 +0100
-+++ PS_ForwardC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PS_ForwardC.h	2005-03-25 15:46:06.196712000 +0100
++++ PS_ForwardC.h	2005-03-25 15:46:17.082364800 +0100
 @@ -68,11 +68,25 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff
index 0aaab7c7879..d9245abacbc 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer.diff
@@ -1,13 +1,5 @@
---- orig/PortableServerC.h	2005-02-22 15:00:22.316185600 +0100
-+++ PortableServerC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PortableServerC.h	2005-03-25 15:46:01.159468800 +0100
++++ PortableServerC.h	2005-03-25 15:46:16.791947200 +0100
 @@ -36,6 +36,10 @@
  
  #include "ace/config-all.h"
@@ -161,16 +153,8 @@
  #endif /* ifndef */
  
 -
---- orig/PortableServerC.cpp	2005-02-22 15:00:22.316185600 +0100
-+++ PortableServerC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PortableServerC.cpp	2005-03-25 15:46:02.180937600 +0100
++++ PortableServerC.cpp	2005-03-25 15:46:16.862048000 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -179,8 +163,8 @@
 +#include "PortableServer.h"
  #include "tao/CDR.h"
  #include "tao/ORB_Core.h"
- #include "tao/Typecode.h"
-@@ -50,7 +50,6 @@
+ #include "tao/Null_RefCount_Policy.h"
+@@ -56,7 +56,6 @@
  // Arg traits specializations.
  namespace TAO
  {
@@ -188,7 +172,7 @@
  #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
  #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
    
-@@ -69,7 +68,6 @@
+@@ -75,7 +74,6 @@
  #endif /* end #if !defined */
  }
  
@@ -196,7 +180,7 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_sequence/sequence_cs.cpp:65
  
-@@ -595,6 +593,8 @@
+@@ -474,6 +472,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/exception_cs.cpp:63
  
@@ -205,44 +189,36 @@
  PortableServer::POA::NoServant::NoServant (void)
    : CORBA::UserException (
          "IDL:omg.org/PortableServer/POA/NoServant:2.3",
-@@ -724,6 +724,8 @@
- ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
-   &_tc_TAO_tc_PortableServer_POA_NoServant;
+@@ -566,6 +566,8 @@
+   return ::PortableServer::POA::_tc_NoServant;
+ }
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/exception_cs.cpp:63
  
---- orig/PortableServerA.cpp	2005-02-22 15:00:22.316185600 +0100
-+++ PortableServerA.cpp	2005-02-27 08:49:04.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PortableServerA.cpp	2005-03-25 15:46:02.180937600 +0100
++++ PortableServerA.cpp	2005-03-25 17:28:43.860998400 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "PortableServerC.h"
 +#include "PortableServer.h"
- #include "tao/Typecode.h"
- #include "tao/CDR.h"
- #include "tao/Any.h"
-@@ -467,6 +467,8 @@
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/any_op_cs.cpp:50
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+ #include "tao/Alias_TypeCode.h"
+@@ -308,6 +308,8 @@
+   return false;
+ }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  ACE_TEMPLATE_SPECIALIZATION
  CORBA::Boolean
- TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
-@@ -536,6 +538,8 @@
+ TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
+@@ -437,6 +439,8 @@
        );
  }
  
@@ -251,7 +227,7 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/any_op_cs.cpp:50
  
-@@ -985,11 +989,15 @@
+@@ -1174,11 +1178,15 @@
          PortableServer::POA::InvalidPolicy
        >;
  
@@ -267,7 +243,7 @@
    template class
      TAO::Any_Dual_Impl_T<
          PortableServer::POA::ObjectAlreadyActive
-@@ -1047,11 +1055,15 @@
+@@ -1236,11 +1244,15 @@
          PortableServer::POA::InvalidPolicy \
        >
  
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
index f014b38bc45..f938a673eec 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
@@ -1,5 +1,5 @@
---- orig/PortableServer_includeC.h	2005-02-22 14:55:31.297721600 +0100
-+++ PortableServer_includeC.h	2005-02-22 14:56:24.994934400 +0100
+--- orig/PortableServer_includeC.h	2005-03-25 15:46:11.914934400 +0100
++++ PortableServer_includeC.h	2005-03-25 15:47:19.141601600 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -17,14 +17,16 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -79,10 +79,6 @@
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+@@ -77,11 +77,7 @@
+ }
  
+ // TAO_IDL - Generated from
+-// be\be_codegen.cpp:969
+-
 -#if defined (__ACE_INLINE__)
 -#include "PortableServer_includeC.inl"
 -#endif /* defined INLINE */
--
++// be\be_codegen.cpp:961
+ 
  #if defined(_MSC_VER)
  #pragma warning(pop)
- #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
index d0902598ac2..48cb404a346 100644
--- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
@@ -1,13 +1,5 @@
---- orig/RequestProcessingPolicyC.h	2005-02-22 14:55:29.304856000 +0100
-+++ RequestProcessingPolicyC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/RequestProcessingPolicyC.h	2005-03-25 15:46:07.668828800 +0100
++++ RequestProcessingPolicyC.h	2005-03-25 15:46:17.252609600 +0100
 @@ -97,6 +97,7 @@
      USE_SERVANT_MANAGER
    };
@@ -31,24 +23,16 @@
  namespace TAO
  {
 @@ -276,6 +279,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/RequestProcessingPolicyC.cpp	2005-02-22 14:55:29.304856000 +0100
-+++ RequestProcessingPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/RequestProcessingPolicyC.cpp	2005-03-25 15:46:07.668828800 +0100
++++ RequestProcessingPolicyC.cpp	2005-03-25 15:46:17.282652800 +0100
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -58,32 +42,24 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/RequestProcessingPolicyA.cpp	2005-02-22 14:55:29.304856000 +0100
-+++ RequestProcessingPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -103,6 +103,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/RequestProcessingPolicyA.cpp	2005-03-25 15:46:07.668828800 +0100
++++ RequestProcessingPolicyA.cpp	2005-03-25 17:36:54.516526400 +0100
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -266,3 +268,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -205,3 +207,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff
index 921a7ddb4cc..52ab76d1832 100644
--- a/TAO/tao/PortableServer/diffs/ServantActivator.diff
+++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff
@@ -1,13 +1,5 @@
---- orig/ServantActivatorC.h	2005-02-22 14:55:29.575244800 +0100
-+++ ServantActivatorC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantActivatorC.h	2005-03-25 15:46:08.189577600 +0100
++++ ServantActivatorC.h	2005-03-25 15:46:17.512984000 +0100
 @@ -75,6 +75,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -24,18 +16,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantActivatorC.cpp	2005-02-22 14:55:29.575244800 +0100
-+++ ServantActivatorC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantActivatorC.cpp	2005-03-25 15:46:08.189577600 +0100
++++ ServantActivatorC.cpp	2005-03-25 15:46:17.563056000 +0100
 @@ -45,6 +45,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -51,26 +35,18 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantActivatorA.cpp	2005-02-22 14:55:29.575244800 +0100
-+++ ServantActivatorA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantActivatorA.cpp	2005-03-25 15:46:08.189577600 +0100
++++ ServantActivatorA.cpp	2005-03-25 17:30:26.718900800 +0100
 @@ -34,6 +34,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+ #include "tao/Any.h"
+ #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ServantActivator[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -156,3 +158,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/objref_typecode.cpp:73
+ 
+@@ -136,3 +138,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
index a496ce70e53..3935feada84 100644
--- a/TAO/tao/PortableServer/diffs/ServantLocator.diff
+++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff
@@ -1,13 +1,5 @@
---- orig/ServantLocatorC.h	2005-02-22 14:55:29.845633600 +0100
-+++ ServantLocatorC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantLocatorC.h	2005-03-25 15:46:08.800456000 +0100
++++ ServantLocatorC.h	2005-03-25 15:46:17.743315200 +0100
 @@ -76,6 +76,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -33,18 +25,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantLocatorC.cpp	2005-02-22 14:55:29.845633600 +0100
-+++ ServantLocatorC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantLocatorC.cpp	2005-03-25 15:46:08.800456000 +0100
++++ ServantLocatorC.cpp	2005-03-25 15:46:17.773358400 +0100
 @@ -45,6 +45,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -60,26 +44,18 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantLocatorA.cpp	2005-02-22 14:55:29.845633600 +0100
-+++ ServantLocatorA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -34,6 +34,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/ServantLocatorA.cpp	2005-03-25 15:46:08.800456000 +0100
++++ ServantLocatorA.cpp	2005-03-25 17:30:54.158356800 +0100
+@@ -35,6 +35,8 @@
+ #include "tao/Any.h"
+ #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ServantLocator[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -155,3 +157,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/objref_typecode.cpp:73
+ 
+@@ -137,3 +139,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff
index c30fd7dd85a..2b9d8f5fabf 100644
--- a/TAO/tao/PortableServer/diffs/ServantManager.diff
+++ b/TAO/tao/PortableServer/diffs/ServantManager.diff
@@ -1,13 +1,5 @@
---- orig/ServantManagerC.h	2005-02-22 14:55:30.075964800 +0100
-+++ ServantManagerC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantManagerC.h	2005-03-25 15:46:09.541521600 +0100
++++ ServantManagerC.h	2005-03-25 15:46:17.983660800 +0100
 @@ -70,6 +70,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -24,18 +16,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantManagerC.cpp	2005-02-22 14:55:30.075964800 +0100
-+++ ServantManagerC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantManagerC.cpp	2005-03-25 15:46:09.541521600 +0100
++++ ServantManagerC.cpp	2005-03-25 15:46:18.023718400 +0100
 @@ -49,6 +49,7 @@
  {
  }
@@ -50,26 +34,18 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantManagerA.cpp	2005-02-22 14:55:30.075964800 +0100
-+++ ServantManagerA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -31,6 +31,8 @@
+--- orig/ServantManagerA.cpp	2005-03-25 15:46:09.541521600 +0100
++++ ServantManagerA.cpp	2005-03-25 15:46:18.063776000 +0100
+@@ -34,6 +34,8 @@
  #include "tao/Any.h"
  #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+ // be\be_visitor_typecode/objref_typecode.cpp:73
  
-@@ -155,3 +157,5 @@
+@@ -136,3 +138,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
index 29c785c7e3f..96a8f965caa 100644
--- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
@@ -1,13 +1,5 @@
---- orig/ServantRetentionPolicyC.h	2005-02-22 14:55:30.616742400 +0100
-+++ ServantRetentionPolicyC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantRetentionPolicyC.h	2005-03-25 15:46:10.593033600 +0100
++++ ServantRetentionPolicyC.h	2005-03-25 15:46:18.524438400 +0100
 @@ -96,6 +96,7 @@
      NON_RETAIN
    };
@@ -31,24 +23,16 @@
  namespace TAO
  {
 @@ -275,6 +278,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantRetentionPolicyC.cpp	2005-02-22 14:55:30.616742400 +0100
-+++ ServantRetentionPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantRetentionPolicyC.cpp	2005-03-25 15:46:10.593033600 +0100
++++ ServantRetentionPolicyC.cpp	2005-03-25 15:46:18.564496000 +0100
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -58,32 +42,24 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantRetentionPolicyA.cpp	2005-02-22 14:55:30.616742400 +0100
-+++ ServantRetentionPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -35,6 +35,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/ServantRetentionPolicyA.cpp	2005-03-25 15:46:10.593033600 +0100
++++ ServantRetentionPolicyA.cpp	2005-03-25 17:38:13.389940800 +0100
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -252,3 +254,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -204,3 +206,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
index 1987c2edc64..494cb6fd13f 100644
--- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
@@ -1,13 +1,5 @@
---- orig/ThreadPolicyC.h	2005-02-22 14:55:30.887131200 +0100
-+++ ThreadPolicyC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ThreadPolicyC.h	2005-03-25 15:46:11.123796800 +0100
++++ ThreadPolicyC.h	2005-03-25 15:46:18.754769600 +0100
 @@ -96,6 +96,7 @@
      SINGLE_THREAD_MODEL
    };
@@ -32,24 +24,16 @@
  {
  
 @@ -275,6 +278,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ThreadPolicyC.cpp	2005-02-22 14:55:30.887131200 +0100
-+++ ThreadPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ThreadPolicyC.cpp	2005-03-25 15:46:11.123796800 +0100
++++ ThreadPolicyC.cpp	2005-03-25 15:46:18.814856000 +0100
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -59,32 +43,24 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ThreadPolicyA.cpp	2005-02-22 14:55:30.887131200 +0100
-+++ ThreadPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -35,6 +35,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/ThreadPolicyA.cpp	2005-03-25 15:46:11.133811200 +0100
++++ ThreadPolicyA.cpp	2005-03-25 17:41:50.912723200 +0100
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -247,3 +249,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -204,3 +206,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
index 3d34019d6e4..fd6348cbc5f 100644
--- a/TAO/tao/RTCORBA/RTCORBAA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAA.cpp
@@ -26,7 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTCORBA.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
@@ -34,1516 +42,607 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_NativePriority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
-    15,
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74790000),  // name = NativePriority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_NativePriority),
-    (char *) &_oc_RTCORBA_NativePriority,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_NativePriority (
+    "IDL:omg.org/RTCORBA/NativePriority:1.0",
+    "NativePriority",
+    &::_tao_tc_CORBA::_tc_short);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_NativePriority =
-    &_tc_TAO_tc_RTCORBA_NativePriority;
+    &_tao_tc_RTCORBA_NativePriority;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_Priority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_Priority),
-    (char *) &_oc_RTCORBA_Priority,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_Priority (
+    "IDL:omg.org/RTCORBA/Priority:1.0",
+    "Priority",
+    &::_tao_tc_CORBA::_tc_short);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Priority =
-    &_tc_TAO_tc_RTCORBA_Priority;
+    &_tao_tc_RTCORBA_Priority;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x6974793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
-    16,
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747900),  // name = NetworkPriority
-    CORBA::tk_long,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NetworkPriority (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_NetworkPriority),
-    (char *) &_oc_RTCORBA_NetworkPriority,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_NetworkPriority (
+    "IDL:omg.org/RTCORBA/NetworkPriority:1.0",
+    "NetworkPriority",
+    &::_tao_tc_CORBA::_tc_long);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_NetworkPriority =
-    &_tc_TAO_tc_RTCORBA_NetworkPriority;
+    &_tao_tc_RTCORBA_NetworkPriority;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
-    13,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
-  ACE_NTOHL (0x0),  // name = ThreadpoolId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_ThreadpoolId),
-    (char *) &_oc_RTCORBA_ThreadpoolId,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ThreadpoolId (
+    "IDL:omg.org/RTCORBA/ThreadpoolId:1.0",
+    "ThreadpoolId",
+    &::_tao_tc_CORBA::_tc_ulong);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolId =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolId;
+    &_tao_tc_RTCORBA_ThreadpoolId;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e653a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
-    15,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
-  3, // member count
-    14,
-  ACE_NTOHL (0x6c616e65), 
-  ACE_NTOHL (0x5f707269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79000000),  // name = lane_priority
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  15,
-  ACE_NTOHL (0x73746174), 
-  ACE_NTOHL (0x69635f74), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64730000),  // name = static_threads
-    CORBA::tk_ulong,
-
-  16,
-  ACE_NTOHL (0x64796e61), 
-  ACE_NTOHL (0x6d69635f), 
-  ACE_NTOHL (0x74687265), 
-  ACE_NTOHL (0x61647300),  // name = dynamic_threads
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane (
-    CORBA::tk_struct,
-    sizeof (_oc_RTCORBA_ThreadpoolLane),
-    (char *) &_oc_RTCORBA_ThreadpoolLane,
-    0,
-    0
-  );
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTCORBA_ThreadpoolLane[] =
+  {
+    { "lane_priority", &RTCORBA::_tc_Priority },
+    { "static_threads", &CORBA::_tc_ulong },
+    { "dynamic_threads", &CORBA::_tc_ulong }
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ThreadpoolLane (
+    "IDL:omg.org/RTCORBA/ThreadpoolLane:1.0",
+    "ThreadpoolLane",
+    _tao_fields_RTCORBA_ThreadpoolLane,
+    3);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolLane;
+    &_tao_tc_RTCORBA_ThreadpoolLane;
 }
 
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e65733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
-    16,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
-    CORBA::tk_sequence, // typecode kind
-  228, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    212, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      39,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
-      ACE_NTOHL (0x6e653a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
-            15,
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
-      ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
-      3, // member count
-            14,
-      ACE_NTOHL (0x6c616e65), 
-      ACE_NTOHL (0x5f707269), 
-      ACE_NTOHL (0x6f726974), 
-      ACE_NTOHL (0x79000000),  // name = lane_priority
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-                9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x0),  // name = Priority
-                CORBA::tk_short,
-
-
-      15,
-      ACE_NTOHL (0x73746174), 
-      ACE_NTOHL (0x69635f74), 
-      ACE_NTOHL (0x68726561), 
-      ACE_NTOHL (0x64730000),  // name = static_threads
-            CORBA::tk_ulong,
-
-      16,
-      ACE_NTOHL (0x64796e61), 
-      ACE_NTOHL (0x6d69635f), 
-      ACE_NTOHL (0x74687265), 
-      ACE_NTOHL (0x61647300),  // name = dynamic_threads
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_ThreadpoolLanes),
-    (char *) &_oc_RTCORBA_ThreadpoolLanes,
-    0,
-    0
-  );
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ThreadpoolLanes_0 (
+    CORBA::tk_sequence,
+    &RTCORBA::_tc_ThreadpoolLane,
+    0U);
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ThreadpoolLanes (
+    "IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0",
+    "ThreadpoolLanes",
+    &::_tao_tc_RTCORBA_ThreadpoolLanes_0);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolLanes;
+    &_tao_tc_RTCORBA_ThreadpoolLanes;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
-  14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c000000),  // name = PriorityModel
-  2, // member count
-  18,
-  ACE_NTOHL (0x434c4945), 
-  ACE_NTOHL (0x4e545f50), 
-  ACE_NTOHL (0x524f5041), 
-  ACE_NTOHL (0x47415445), 
-  ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
-  16,
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x45525f44), 
-  ACE_NTOHL (0x45434c41), 
-  ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_RTCORBA_PriorityModel[] =
+  {
+    "CLIENT_PROPAGATED",
+    "SERVER_DECLARED"
+
   };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel (
-    CORBA::tk_enum,
-    sizeof (_oc_RTCORBA_PriorityModel),
-    (char *) &_oc_RTCORBA_PriorityModel,
-    0,
-    0
-  );
+static TAO::TypeCode::Enum<char const *,
+                           TAO::TypeCode::Enumerator<char const *> const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PriorityModel (
+    "IDL:omg.org/RTCORBA/PriorityModel:1.0",
+    "PriorityModel",
+    _tao_enumerators_RTCORBA_PriorityModel,
+    2);
 
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityModel =
-    &_tc_TAO_tc_RTCORBA_PriorityModel;
+    &_tao_tc_RTCORBA_PriorityModel;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
-    20,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModelPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_PriorityModelPolicy),
-    (char *) &_oc_RTCORBA_PriorityModelPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PriorityModelPolicy (
+    "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0",
+    "PriorityModelPolicy");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy =
-    &_tc_TAO_tc_RTCORBA_PriorityModelPolicy;
+    &_tao_tc_RTCORBA_PriorityModelPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
-    17,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ThreadpoolPolicy),
-    (char *) &_oc_RTCORBA_ThreadpoolPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ThreadpoolPolicy (
+    "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0",
+    "ThreadpoolPolicy");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy;
+    &_tao_tc_RTCORBA_ThreadpoolPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-    19,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ProtocolProperties),
-    (char *) &_oc_RTCORBA_ProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ProtocolProperties (
+    "IDL:omg.org/RTCORBA/ProtocolProperties:1.0",
+    "ProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_ProtocolProperties;
+    &_tao_tc_RTCORBA_ProtocolProperties;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_Protocol[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
-    9,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x0),  // name = Protocol
-  3, // member count
-    14,
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f747970), 
-  ACE_NTOHL (0x65000000),  // name = protocol_type
-    CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x643a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10,
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
-
-
-  24,
-  ACE_NTOHL (0x6f72625f), 
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f70726f), 
-  ACE_NTOHL (0x70657274), 
-  ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
-    CORBA::tk_objref, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-        19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
-  30,
-  ACE_NTOHL (0x7472616e), 
-  ACE_NTOHL (0x73706f72), 
-  ACE_NTOHL (0x745f7072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5f70), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
-    CORBA::tk_objref, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-        19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
-};
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
-    CORBA::tk_struct,
-    sizeof (_oc_RTCORBA_Protocol),
-    (char *) &_oc_RTCORBA_Protocol,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTCORBA_Protocol[] =
+  {
+    { "protocol_type", &IOP::_tc_ProfileId },
+    { "orb_protocol_properties", &RTCORBA::_tc_ProtocolProperties },
+    { "transport_protocol_properties", &RTCORBA::_tc_ProtocolProperties }
+    
+  };
 
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_Protocol (
+    "IDL:omg.org/RTCORBA/Protocol:1.0",
+    "Protocol",
+    _tao_fields_RTCORBA_Protocol,
+    3);
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Protocol =
-    &_tc_TAO_tc_RTCORBA_Protocol;
+    &_tao_tc_RTCORBA_Protocol;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
-    13,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = ProtocolList
-    CORBA::tk_sequence, // typecode kind
-  400, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    384, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
-            9,
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x0),  // name = Protocol
-      3, // member count
-            14,
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f747970), 
-      ACE_NTOHL (0x65000000),  // name = protocol_type
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x643a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-                10,
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x64000000),  // name = ProfileId
-                CORBA::tk_ulong,
-
-
-      24,
-      ACE_NTOHL (0x6f72625f), 
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f70726f), 
-      ACE_NTOHL (0x70657274), 
-      ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
-            CORBA::tk_objref, // typecode kind
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-                19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
-      30,
-      ACE_NTOHL (0x7472616e), 
-      ACE_NTOHL (0x73706f72), 
-      ACE_NTOHL (0x745f7072), 
-      ACE_NTOHL (0x6f746f63), 
-      ACE_NTOHL (0x6f6c5f70), 
-      ACE_NTOHL (0x726f7065), 
-      ACE_NTOHL (0x72746965), 
-      ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
-            CORBA::tk_objref, // typecode kind
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-                19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolList (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_ProtocolList),
-    (char *) &_oc_RTCORBA_ProtocolList,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ProtocolList_0 (
+    CORBA::tk_sequence,
+    &RTCORBA::_tc_Protocol,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ProtocolList (
+    "IDL:omg.org/RTCORBA/ProtocolList:1.0",
+    "ProtocolList",
+    &::_tao_tc_RTCORBA_ProtocolList_0);
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolList =
-    &_tc_TAO_tc_RTCORBA_ProtocolList;
+    &_tao_tc_RTCORBA_ProtocolList;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
-    21,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ServerProtocolPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ServerProtocolPolicy),
-    (char *) &_oc_RTCORBA_ServerProtocolPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ServerProtocolPolicy (
+    "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0",
+    "ServerProtocolPolicy");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy =
-    &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy;
+    &_tao_tc_RTCORBA_ServerProtocolPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
-    21,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ClientProtocolPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ClientProtocolPolicy),
-    (char *) &_oc_RTCORBA_ClientProtocolPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_ClientProtocolPolicy (
+    "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0",
+    "ClientProtocolPolicy");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy =
-    &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy;
+    &_tao_tc_RTCORBA_ClientProtocolPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
-    24,
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PrivateConnectionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_PrivateConnectionPolicy),
-    (char *) &_oc_RTCORBA_PrivateConnectionPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PrivateConnectionPolicy (
+    "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0",
+    "PrivateConnectionPolicy");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy =
-    &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy;
+    &_tao_tc_RTCORBA_PrivateConnectionPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x733a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
-    22,
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_TCPProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_TCPProtocolProperties),
-    (char *) &_oc_RTCORBA_TCPProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_TCPProtocolProperties (
+    "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0",
+    "TCPProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_TCPProtocolProperties;
+    &_tao_tc_RTCORBA_TCPProtocolProperties;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
-    23,
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_GIOPProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_GIOPProtocolProperties),
-    (char *) &_oc_RTCORBA_GIOPProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_GIOPProtocolProperties (
+    "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0",
+    "GIOPProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties;
+    &_tao_tc_RTCORBA_GIOPProtocolProperties;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
-    29,
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
-  ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_UnixDomainProtocolProperties),
-    (char *) &_oc_RTCORBA_UnixDomainProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_UnixDomainProtocolProperties (
+    "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0",
+    "UnixDomainProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties;
+    &_tao_tc_RTCORBA_UnixDomainProtocolProperties;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
-    31,
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_SharedMemoryProtocolProperties),
-    (char *) &_oc_RTCORBA_SharedMemoryProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_SharedMemoryProtocolProperties (
+    "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0",
+    "SharedMemoryProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties;
+    &_tao_tc_RTCORBA_SharedMemoryProtocolProperties;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_UserDatagramProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x55736572), 
-  ACE_NTOHL (0x44617461), 
-  ACE_NTOHL (0x6772616d), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0
-    31,
-  ACE_NTOHL (0x55736572), 
-  ACE_NTOHL (0x44617461), 
-  ACE_NTOHL (0x6772616d), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = UserDatagramProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_UserDatagramProtocolProperties),
-    (char *) &_oc_RTCORBA_UserDatagramProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_UserDatagramProtocolProperties (
+    "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0",
+    "UserDatagramProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties;
+    &_tao_tc_RTCORBA_UserDatagramProtocolProperties;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_StreamControlProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53747265), 
-  ACE_NTOHL (0x616d436f), 
-  ACE_NTOHL (0x6e74726f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x746f636f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x70657274), 
-  ACE_NTOHL (0x6965733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0
-    32,
-  ACE_NTOHL (0x53747265), 
-  ACE_NTOHL (0x616d436f), 
-  ACE_NTOHL (0x6e74726f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x746f636f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x70657274), 
-  ACE_NTOHL (0x69657300),  // name = StreamControlProtocolProperties
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_StreamControlProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_StreamControlProtocolProperties),
-    (char *) &_oc_RTCORBA_StreamControlProtocolProperties,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_StreamControlProtocolProperties (
+    "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0",
+    "StreamControlProtocolProperties");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_StreamControlProtocolProperties;
+    &_tao_tc_RTCORBA_StreamControlProtocolProperties;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-    13,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x0),  // name = PriorityBand
-  2, // member count
-    4,
-  ACE_NTOHL (0x6c6f7700),  // name = low
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  5,
-  ACE_NTOHL (0x68696768), 
-  ACE_NTOHL (0x0),  // name = high
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (
-    CORBA::tk_struct,
-    sizeof (_oc_RTCORBA_PriorityBand),
-    (char *) &_oc_RTCORBA_PriorityBand,
-    0,
-    0
-  );
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTCORBA_PriorityBand[] =
+  {
+    { "low", &RTCORBA::_tc_Priority },
+    { "high", &RTCORBA::_tc_Priority }
+    
+  };
 
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PriorityBand (
+    "IDL:omg.org/RTCORBA/PriorityBand:1.0",
+    "PriorityBand",
+    _tao_fields_RTCORBA_PriorityBand,
+    2);
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBand =
-    &_tc_TAO_tc_RTCORBA_PriorityBand;
+    &_tao_tc_RTCORBA_PriorityBand;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x733a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
-    14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x73000000),  // name = PriorityBands
-    CORBA::tk_sequence, // typecode kind
-  252, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    236, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-            13,
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
-      ACE_NTOHL (0x0),  // name = PriorityBand
-      2, // member count
-            4,
-      ACE_NTOHL (0x6c6f7700),  // name = low
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-                9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x0),  // name = Priority
-                CORBA::tk_short,
-
-
-      5,
-      ACE_NTOHL (0x68696768), 
-      ACE_NTOHL (0x0),  // name = high
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-                9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x0),  // name = Priority
-                CORBA::tk_short,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_PriorityBands),
-    (char *) &_oc_RTCORBA_PriorityBands,
-    0,
-    0
-  );
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PriorityBands_0 (
+    CORBA::tk_sequence,
+    &RTCORBA::_tc_PriorityBand,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PriorityBands (
+    "IDL:omg.org/RTCORBA/PriorityBands:1.0",
+    "PriorityBands",
+    &::_tao_tc_RTCORBA_PriorityBands_0);
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBands =
-    &_tc_TAO_tc_RTCORBA_PriorityBands;
+    &_tao_tc_RTCORBA_PriorityBands;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
-    31,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_PriorityBandedConnectionPolicy),
-    (char *) &_oc_RTCORBA_PriorityBandedConnectionPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_PriorityBandedConnectionPolicy (
+    "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0",
+    "PriorityBandedConnectionPolicy");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy =
-    &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy;
+    &_tao_tc_RTCORBA_PriorityBandedConnectionPolicy;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_Current),
-    (char *) &_oc_RTCORBA_Current,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_Current (
+    "IDL:omg.org/RTCORBA/Current:1.0",
+    "Current");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tc_TAO_tc_RTCORBA_Current;
+    &_tao_tc_RTCORBA_Current;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_Mutex[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x783a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
-    6,
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x78000000),  // name = Mutex
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Mutex (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_Mutex),
-    (char *) &_oc_RTCORBA_Mutex,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_Mutex (
+    "IDL:omg.org/RTCORBA/Mutex:1.0",
+    "Mutex");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Mutex =
-    &_tc_TAO_tc_RTCORBA_Mutex;
+    &_tao_tc_RTCORBA_Mutex;
 }
 
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTCORBA_RTORB_MutexNotFound[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_RTORB_MutexNotFound (
+    "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
+    "MutexNotFound",
+    _tao_fields_RTCORBA_RTORB_MutexNotFound,
+    0);
+  
+::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound =
+  &_tao_tc_RTCORBA_RTORB_MutexNotFound;
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_RTORB[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x423a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
-    6,
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x42000000),  // name = RTORB
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTCORBA_RTORB_InvalidThreadpool[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_RTORB),
-    (char *) &_oc_RTCORBA_RTORB,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_RTORB_InvalidThreadpool (
+    "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
+    "InvalidThreadpool",
+    _tao_fields_RTCORBA_RTORB_InvalidThreadpool,
+    0);
+  
+::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool =
+  &_tao_tc_RTCORBA_RTORB_InvalidThreadpool;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTCORBA_RTORB (
+    "IDL:omg.org/RTCORBA/RTORB:1.0",
+    "RTORB");
+  
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_RTORB =
-    &_tc_TAO_tc_RTCORBA_RTORB;
+    &_tao_tc_RTCORBA_RTORB;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -1614,7 +713,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert_copy (
       _tao_any,
       RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLanes,
+      RTCORBA_ThreadpoolLanes_0,
       _tao_elem
     );
 }
@@ -1628,7 +727,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert (
       _tao_any,
       RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLanes,
+      RTCORBA_ThreadpoolLanes_0,
       _tao_elem
     );
 }
@@ -1655,7 +754,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::extract (
         _tao_any,
         RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-        RTCORBA::_tc_ThreadpoolLanes,
+        RTCORBA_ThreadpoolLanes_0,
         _tao_elem
       );
 }
@@ -1691,7 +790,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1701,14 +800,14 @@ TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1760,7 +859,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1770,14 +869,14 @@ TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -1829,7 +928,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -1839,14 +938,14 @@ TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -1993,7 +1092,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert_copy (
       _tao_any,
       RTCORBA::ProtocolList::_tao_any_destructor,
-      RTCORBA::_tc_ProtocolList,
+      RTCORBA_ProtocolList_0,
       _tao_elem
     );
 }
@@ -2007,7 +1106,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert (
       _tao_any,
       RTCORBA::ProtocolList::_tao_any_destructor,
-      RTCORBA::_tc_ProtocolList,
+      RTCORBA_ProtocolList_0,
       _tao_elem
     );
 }
@@ -2034,7 +1133,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::extract (
         _tao_any,
         RTCORBA::ProtocolList::_tao_any_destructor,
-        RTCORBA::_tc_ProtocolList,
+        RTCORBA_ProtocolList_0,
         _tao_elem
       );
 }
@@ -2042,7 +1141,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2052,14 +1151,14 @@ TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -2111,7 +1210,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2121,14 +1220,14 @@ TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -2180,7 +1279,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2190,14 +1289,14 @@ TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -2249,7 +1348,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2259,14 +1358,14 @@ TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -2318,7 +1417,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2328,14 +1427,14 @@ TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -2387,7 +1486,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2397,14 +1496,14 @@ TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -2456,7 +1555,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2466,14 +1565,14 @@ TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -2525,7 +1624,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2535,14 +1634,14 @@ TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -2594,7 +1693,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2604,14 +1703,14 @@ TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
 {
@@ -2730,7 +1829,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert_copy (
       _tao_any,
       RTCORBA::PriorityBands::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBands,
+      RTCORBA_PriorityBands_0,
       _tao_elem
     );
 }
@@ -2744,7 +1843,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert (
       _tao_any,
       RTCORBA::PriorityBands::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBands,
+      RTCORBA_PriorityBands_0,
       _tao_elem
     );
 }
@@ -2771,7 +1870,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::extract (
         _tao_any,
         RTCORBA::PriorityBands::_tao_any_destructor,
-        RTCORBA::_tc_PriorityBands,
+        RTCORBA_PriorityBands_0,
         _tao_elem
       );
 }
@@ -2779,7 +1878,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2789,14 +1888,14 @@ TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
 {
@@ -2848,7 +1947,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::Current>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2858,14 +1957,14 @@ TAO::Any_Impl_T<RTCORBA::Current>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
 {
@@ -2917,7 +2016,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::Mutex>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2927,14 +2026,14 @@ TAO::Any_Impl_T<RTCORBA::Mutex>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
 {
@@ -2986,7 +2085,7 @@ operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::RTORB>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -2996,14 +2095,14 @@ TAO::Any_Impl_T<RTCORBA::RTORB>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
 {
@@ -3055,14 +2154,14 @@ operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
 {
@@ -3127,14 +2226,14 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index c2fd1afc254..198ac9065ed 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -31,7 +31,15 @@
 
 #include "RTCORBA.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
@@ -71,7 +79,7 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:68
 
 void 
 RTCORBA::ThreadpoolLane::_tao_any_destructor (
@@ -568,7 +576,7 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:68
 
 void 
 RTCORBA::Protocol::_tao_any_destructor (
@@ -1939,7 +1947,7 @@ RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:68
 
 void 
 RTCORBA::PriorityBand::_tao_any_destructor (
@@ -2561,48 +2569,11 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const
+CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_tao_type (void) const
 {
   return ::RTCORBA::RTORB::_tc_MutexNotFound;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x422f4d75), 
-  ACE_NTOHL (0x7465784e), 
-  ACE_NTOHL (0x6f74466f), 
-  ACE_NTOHL (0x756e643a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0
-    14,
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x784e6f74), 
-  ACE_NTOHL (0x466f756e), 
-  ACE_NTOHL (0x64000000),  // name = MutexNotFound
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
-    CORBA::tk_except,
-    sizeof (_oc_RTCORBA_RTORB_MutexNotFound),
-    (char *) &_oc_RTCORBA_RTORB_MutexNotFound,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound =
-  &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -2693,50 +2664,11 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const
+CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_tao_type (void) const
 {
   return ::RTCORBA::RTORB::_tc_InvalidThreadpool;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x422f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64546872), 
-  ACE_NTOHL (0x65616470), 
-  ACE_NTOHL (0x6f6f6c3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0
-    18,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696454), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64706f6f), 
-  ACE_NTOHL (0x6c000000),  // name = InvalidThreadpool
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool (
-    CORBA::tk_except,
-    sizeof (_oc_RTCORBA_RTORB_InvalidThreadpool),
-    (char *) &_oc_RTCORBA_RTORB_InvalidThreadpool,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool =
-  &_tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool;
-
 RTCORBA::RTORB::RTORB (void)
 {}
 
@@ -2942,23 +2874,22 @@ CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_cs.cpp:51
 
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval)
+CORBA::Boolean operator<< (TAO_OutputCDR & strm, RTCORBA::PriorityModel _tao_enumerator)
 {
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
+  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
 }
 
-CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enumval)
+CORBA::Boolean operator>> (TAO_InputCDR & strm, RTCORBA::PriorityModel & _tao_enumerator)
 {
   CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  CORBA::Boolean const _tao_success = strm >> _tao_temp;
   
-  if (_tao_result == 1)
+  if (_tao_success)
     {
-      _tao_enumval = static_cast<RTCORBA::PriorityModel> (_tao_temp);
+      _tao_enumerator = static_cast<RTCORBA::PriorityModel> (_tao_temp);
     }
   
-  return _tao_result;
+  return _tao_success;
 }
 
 // TAO_IDL - Generated from
@@ -3057,7 +2988,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 92d917acded..1a23dab75c2 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -56,12 +56,13 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/Encodable.h"
 
 #include "tao/IOPC.h"
 #include "tao/TimeBaseC.h"
 #include "tao/PolicyC.h"
 
+#include "tao/Encodable.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -201,7 +202,7 @@ namespace RTCORBA
         ThreadpoolLane
       >
     ThreadpoolLanes_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ThreadpoolLanes,
@@ -209,7 +210,7 @@ namespace RTCORBA
         ThreadpoolLane
       >
     ThreadpoolLanes_out;
-  
+
   class TAO_RTCORBA_Export ThreadpoolLanes
     : public
         TAO_Unbounded_Sequence<
@@ -222,60 +223,60 @@ namespace RTCORBA
     ThreadpoolLanes (
         CORBA::ULong max,
         CORBA::ULong length,
-        ThreadpoolLane* buffer, 
+        ThreadpoolLane* buffer,
         CORBA::Boolean release = 0
       );
     ThreadpoolLanes (const ThreadpoolLanes &);
     ~ThreadpoolLanes (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ThreadpoolLanes_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum PriorityModel
   {
     CLIENT_PROPAGATED,
     SERVER_DECLARED
   };
-  
+
   typedef PriorityModel &PriorityModel_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityModel;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_
-  
+
   class PriorityModelPolicy;
   typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PriorityModelPolicy
       >
     PriorityModelPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PriorityModelPolicy
@@ -283,133 +284,133 @@ namespace RTCORBA
     PriorityModelPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export PriorityModelPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef PriorityModelPolicy_ptr _ptr_type;
     typedef PriorityModelPolicy_var _var_type;
-    
+
     // The static operations.
     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
-    
+
     static void _tao_release (PriorityModelPolicy_ptr obj);
-    
+
     static PriorityModelPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PriorityModelPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PriorityModelPolicy_ptr _nil (void)
     {
       return static_cast<PriorityModelPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::PriorityModel priority_model (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::Priority server_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PriorityModelPolicy (void);
-    
+
     virtual ~PriorityModelPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PriorityModelPolicy (const PriorityModelPolicy &);
-    
+
     void operator= (const PriorityModelPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_
-  
+
   class ThreadpoolPolicy;
   typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ThreadpoolPolicy
       >
     ThreadpoolPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ThreadpoolPolicy
@@ -417,118 +418,118 @@ namespace RTCORBA
     ThreadpoolPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export ThreadpoolPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ThreadpoolPolicy_ptr _ptr_type;
     typedef ThreadpoolPolicy_var _var_type;
-    
+
     // The static operations.
     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
-    
+
     static void _tao_release (ThreadpoolPolicy_ptr obj);
-    
+
     static ThreadpoolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadpoolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadpoolPolicy_ptr _nil (void)
     {
       return static_cast<ThreadpoolPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::ThreadpoolId threadpool (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ThreadpoolPolicy (void);
-    
+
     virtual ~ThreadpoolPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ThreadpoolPolicy (const ThreadpoolPolicy &);
-    
+
     void operator= (const ThreadpoolPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ProtocolProperties
       >
     ProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ProtocolProperties
@@ -536,13 +537,13 @@ namespace RTCORBA
     ProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual CORBA::Object
     , public virtual TAO_Encodable
@@ -550,114 +551,114 @@ namespace RTCORBA
   public:
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
-    
+
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-    
+
     static void _tao_release (ProtocolProperties_ptr obj);
-    
+
     static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ProtocolProperties_ptr _nil (void)
     {
       return static_cast<ProtocolProperties_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
     // CDR Encoder/Decoder methods. (handcrafted)
     virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
     virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
   protected:
     // Abstract or local interface only.
     ProtocolProperties (void);
-    
+
     virtual ~ProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ProtocolProperties (const ProtocolProperties &);
-    
+
     void operator= (const ProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ProtocolProperties;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Protocol;
-  
+
   typedef
     TAO_Var_Var_T<
         Protocol
       >
     Protocol_var;
-  
+
   typedef
     TAO_Out_T<
         Protocol,
         Protocol_var
       >
     Protocol_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_RTCORBA_Export Protocol
   {
     typedef Protocol_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::ProfileId protocol_type;
     RTCORBA::ProtocolProperties_var orb_protocol_properties;
     RTCORBA::ProtocolProperties_var transport_protocol_properties;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Protocol;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CH_)
 #define _RTCORBA_PROTOCOLLIST_CH_
-  
+
   class ProtocolList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         ProtocolList,
         Protocol
       >
     ProtocolList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ProtocolList,
@@ -665,7 +666,7 @@ namespace RTCORBA
         Protocol
       >
     ProtocolList_out;
-  
+
   class TAO_RTCORBA_Export ProtocolList
     : public
         TAO_Unbounded_Sequence<
@@ -678,44 +679,44 @@ namespace RTCORBA
     ProtocolList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Protocol* buffer, 
+        Protocol* buffer,
         CORBA::Boolean release = 0
       );
     ProtocolList (const ProtocolList &);
     ~ProtocolList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ProtocolList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ProtocolList;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_
-  
+
   class ServerProtocolPolicy;
   typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServerProtocolPolicy
       >
     ServerProtocolPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServerProtocolPolicy
@@ -723,123 +724,123 @@ namespace RTCORBA
     ServerProtocolPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export ServerProtocolPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ServerProtocolPolicy_ptr _ptr_type;
     typedef ServerProtocolPolicy_var _var_type;
-    
+
     // The static operations.
     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-    
+
     static void _tao_release (ServerProtocolPolicy_ptr obj);
-    
+
     static ServerProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerProtocolPolicy_ptr _nil (void)
     {
       return static_cast<ServerProtocolPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServerProtocolPolicy (void);
-    
+
     virtual ~ServerProtocolPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerProtocolPolicy (const ServerProtocolPolicy &);
-    
+
     void operator= (const ServerProtocolPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_
-  
+
   class ClientProtocolPolicy;
   typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ClientProtocolPolicy
       >
     ClientProtocolPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ClientProtocolPolicy
@@ -847,123 +848,123 @@ namespace RTCORBA
     ClientProtocolPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export ClientProtocolPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ClientProtocolPolicy_ptr _ptr_type;
     typedef ClientProtocolPolicy_var _var_type;
-    
+
     // The static operations.
     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-    
+
     static void _tao_release (ClientProtocolPolicy_ptr obj);
-    
+
     static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientProtocolPolicy_ptr _nil (void)
     {
       return static_cast<ClientProtocolPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ClientProtocolPolicy (void);
-    
+
     virtual ~ClientProtocolPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ClientProtocolPolicy (const ClientProtocolPolicy &);
-    
+
     void operator= (const ClientProtocolPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_
-  
+
   class PrivateConnectionPolicy;
   typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PrivateConnectionPolicy
       >
     PrivateConnectionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PrivateConnectionPolicy
@@ -971,79 +972,79 @@ namespace RTCORBA
     PrivateConnectionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export PrivateConnectionPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef PrivateConnectionPolicy_ptr _ptr_type;
     typedef PrivateConnectionPolicy_var _var_type;
-    
+
     // The static operations.
     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-    
+
     static void _tao_release (PrivateConnectionPolicy_ptr obj);
-    
+
     static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrivateConnectionPolicy_ptr _nil (void)
     {
       return static_cast<PrivateConnectionPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PrivateConnectionPolicy (void);
-    
+
     virtual ~PrivateConnectionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
@@ -2633,7 +2634,7 @@ namespace RTCORBA
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -2780,7 +2781,7 @@ namespace RTCORBA
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -3489,7 +3490,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
-TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityModel &);
+TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, RTCORBA::PriorityModel);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
@@ -3516,7 +3517,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RTCORBAC.inl"
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
index 39802b80c63..5cf8a35e1c8 100644
--- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff
+++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
@@ -1,5 +1,5 @@
---- orig/RTCORBAC.h	2005-02-18 12:15:48.103436800 +0100
-+++ RTCORBAC.h	2005-02-18 12:15:48.443926400 +0100
+--- orig/RTCORBAC.h	2005-03-25 19:39:53.847483200 +0100
++++ RTCORBAC.h	2005-03-25 19:41:00.863848000 +0100
 @@ -36,12 +36,18 @@
  
  #include "ace/config-all.h"
@@ -19,18 +19,16 @@
  #include "tao/SystemException.h"
  #include "tao/Environment.h"
  #include "tao/Object.h"
-@@ -50,7 +56,10 @@
- #include "tao/Seq_Var_T.h"
- #include "tao/Seq_Out_T.h"
- #include "tao/VarOut_T.h"
-+#include "tao/Encodable.h"
-+#include "tao/PolicyC.h"
+@@ -55,6 +61,8 @@
+ #include "tao/TimeBaseC.h"
+ #include "tao/PolicyC.h"
  
-+#include "tao/IOPC.h"
++#include "tao/Encodable.h"
++
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
  #endif
-@@ -530,6 +539,7 @@
+@@ -538,6 +546,7 @@
    
    class TAO_RTCORBA_Export ProtocolProperties
      : public virtual CORBA::Object
@@ -38,7 +36,7 @@
    {
    public:
      typedef ProtocolProperties_ptr _ptr_type;
-@@ -566,6 +576,9 @@
+@@ -576,6 +585,9 @@
      virtual const char* _interface_repository_id (void) const;
      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
    
@@ -48,8 +46,8 @@
    protected:
      // Abstract or local interface only.
      ProtocolProperties (void);
---- orig/RTCORBAC.cpp	2005-02-18 12:15:48.103436800 +0100
-+++ RTCORBAC.cpp	2005-02-18 12:15:48.453940800 +0100
+--- orig/RTCORBAC.cpp	2005-03-25 19:39:53.847483200 +0100
++++ RTCORBAC.cpp	2005-03-25 19:39:54.318160000 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -57,9 +55,9 @@
 -#include "RTCORBAC.h"
 +#include "RTCORBA.h"
  #include "tao/CDR.h"
- #include "tao/Typecode.h"
- #include "tao/Basic_Arguments.h"
-@@ -53,6 +53,22 @@
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+@@ -61,6 +61,22 @@
  {
  }
  
@@ -81,15 +79,15 @@
 +}
  
  // TAO_IDL - Generated from 
- // be\be_visitor_structure/structure_cs.cpp:66
---- orig/RTCORBAA.cpp	2005-02-18 12:15:48.103436800 +0100
-+++ RTCORBAA.cpp	2005-02-18 12:15:48.473969600 +0100
+ // be\be_visitor_structure/structure_cs.cpp:68
+--- orig/RTCORBAA.cpp	2005-03-25 19:39:53.857497600 +0100
++++ RTCORBAA.cpp	2005-03-25 19:40:06.796102400 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "RTCORBAC.h"
 +#include "RTCORBA.h"
- #include "tao/Typecode.h"
- #include "tao/CDR.h"
- #include "tao/Any.h"
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+ #include "tao/Alias_TypeCode.h"
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 &)
 {
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 453acf53e01..c7d346a38d6 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -197,7 +197,7 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index d194c7d6e7b..910adecaa02 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -276,7 +276,7 @@ TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::PO
 TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerC.inl"
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
index 31cb9bd8db5..e253eb4d445 100644
--- a/TAO/tao/RTScheduling/RTSchedulerA.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp
@@ -26,317 +26,218 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTScheduler.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
-static const CORBA::Long _oc_RTScheduling_ThreadAction[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f546872), 
-  ACE_NTOHL (0x65616441), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/ThreadAction:1.0
-    13,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x61644163), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = ThreadAction
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ThreadAction (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_ThreadAction),
-    (char *) &_oc_RTScheduling_ThreadAction,
-    0,
-    0
-  );
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_ThreadAction (
+    "IDL:RTScheduling/ThreadAction:1.0",
+    "ThreadAction");
 
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadAction =
-    &_tc_TAO_tc_RTScheduling_ThreadAction;
+    &_tao_tc_RTScheduling_ThreadAction;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_RTScheduling_DistributableThread_DT_State[] =
+  {
+    "ACTIVE",
+    "CANCELLED"
 
-static const CORBA::Long _oc_RTScheduling_DistributableThread_DT_State[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f446973), 
-  ACE_NTOHL (0x74726962), 
-  ACE_NTOHL (0x75746162), 
-  ACE_NTOHL (0x6c655468), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x2f44545f), 
-  ACE_NTOHL (0x53746174), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/DistributableThread/DT_State:1.0
-  9,
-  ACE_NTOHL (0x44545f53), 
-  ACE_NTOHL (0x74617465), 
-  ACE_NTOHL (0x0),  // name = DT_State
-  2, // member count
-  7,
-  ACE_NTOHL (0x41435449), 
-  ACE_NTOHL (0x56450000),  // name = ACTIVE
-  10,
-  ACE_NTOHL (0x43414e43), 
-  ACE_NTOHL (0x454c4c45), 
-  ACE_NTOHL (0x44000000),  // name = CANCELLED
   };
 
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread_DT_State (
-    CORBA::tk_enum,
-    sizeof (_oc_RTScheduling_DistributableThread_DT_State),
-    (char *) &_oc_RTScheduling_DistributableThread_DT_State,
-    0,
-    0
-  );
+static TAO::TypeCode::Enum<char const *,
+                           TAO::TypeCode::Enumerator<char const *> const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_DistributableThread_DT_State (
+    "IDL:RTScheduling/DistributableThread/DT_State:1.0",
+    "DT_State",
+    _tao_enumerators_RTScheduling_DistributableThread_DT_State,
+    2);
 
 ::CORBA::TypeCode_ptr const RTScheduling::DistributableThread::_tc_DT_State =
-  &_tc_TAO_tc_RTScheduling_DistributableThread_DT_State;
+  &_tao_tc_RTScheduling_DistributableThread_DT_State;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTScheduling_DistributableThread[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f446973), 
-  ACE_NTOHL (0x74726962), 
-  ACE_NTOHL (0x75746162), 
-  ACE_NTOHL (0x6c655468), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/DistributableThread:1.0
-    20,
-  ACE_NTOHL (0x44697374), 
-  ACE_NTOHL (0x72696275), 
-  ACE_NTOHL (0x7461626c), 
-  ACE_NTOHL (0x65546872), 
-  ACE_NTOHL (0x65616400),  // name = DistributableThread
-  };
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_DistributableThread),
-    (char *) &_oc_RTScheduling_DistributableThread,
-    0,
-    0
-  );
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_DistributableThread (
+    "IDL:RTScheduling/DistributableThread:1.0",
+    "DistributableThread");
 
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_DistributableThread =
-    &_tc_TAO_tc_RTScheduling_DistributableThread;
+    &_tao_tc_RTScheduling_DistributableThread;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static const CORBA::Long _oc_RTScheduling_Current_IdType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f437572), 
-  ACE_NTOHL (0x72656e74), 
-  ACE_NTOHL (0x2f496454), 
-  ACE_NTOHL (0x7970653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:RTScheduling/Current/IdType:1.0
-    7,
-  ACE_NTOHL (0x49645479), 
-  ACE_NTOHL (0x70650000),  // name = IdType
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_IdType (
-    CORBA::tk_alias,
-    sizeof (_oc_RTScheduling_Current_IdType),
-    (char *) &_oc_RTScheduling_Current_IdType,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE[] =
+  {
+
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE (
+    "IDL:RTScheduling/Current/UNSUPPORTED_SCHEDULING_DISCIPLINE:1.0",
+    "UNSUPPORTED_SCHEDULING_DISCIPLINE",
+    _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
+    0);
+
+::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
+  &_tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Current_IdType_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_octet,
+    0U);
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Current_IdType (
+    "IDL:RTScheduling/Current/IdType:1.0",
+    "IdType",
+    &::_tao_tc_RTScheduling_Current_IdType_0);
 
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_IdType =
-  &_tc_TAO_tc_RTScheduling_Current_IdType;
+  &_tao_tc_RTScheduling_Current_IdType;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_RTScheduling_Current_NameList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f437572), 
-  ACE_NTOHL (0x72656e74), 
-  ACE_NTOHL (0x2f4e616d), 
-  ACE_NTOHL (0x654c6973), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/Current/NameList:1.0
-    9,
-  ACE_NTOHL (0x4e616d65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = NameList
-    CORBA::tk_sequence, // typecode kind
-  16, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string, 
-    0U, // string length
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_NameList (
-    CORBA::tk_alias,
-    sizeof (_oc_RTScheduling_Current_NameList),
-    (char *) &_oc_RTScheduling_Current_NameList,
-    0,
-    0
-  );
 
-::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_NameList =
-  &_tc_TAO_tc_RTScheduling_Current_NameList;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/typecode_defn.cpp:744
 
-static const CORBA::Long _oc_RTScheduling_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f437572), 
-  ACE_NTOHL (0x72656e74), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Current_NameList_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_string,
+    0U);
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Current_NameList (
+    "IDL:RTScheduling/Current/NameList:1.0",
+    "NameList",
+    &::_tao_tc_RTScheduling_Current_NameList_0);
+
+::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_NameList =
+  &_tao_tc_RTScheduling_Current_NameList;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_Current),
-    (char *) &_oc_RTScheduling_Current,
-    0,
-    0
-  );
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Current (
+    "IDL:RTScheduling/Current:1.0",
+    "Current");
 
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tc_TAO_tc_RTScheduling_Current;
+    &_tao_tc_RTScheduling_Current;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_RTScheduling_ResourceManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f526573), 
-  ACE_NTOHL (0x6f757263), 
-  ACE_NTOHL (0x654d616e), 
-  ACE_NTOHL (0x61676572), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/ResourceManager:1.0
-    16,
-  ACE_NTOHL (0x5265736f), 
-  ACE_NTOHL (0x75726365), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x67657200),  // name = ResourceManager
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ResourceManager (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_ResourceManager),
-    (char *) &_oc_RTScheduling_ResourceManager,
-    0,
-    0
-  );
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_ResourceManager (
+    "IDL:RTScheduling/ResourceManager:1.0",
+    "ResourceManager");
 
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ResourceManager =
-    &_tc_TAO_tc_RTScheduling_ResourceManager;
+    &_tao_tc_RTScheduling_ResourceManager;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static const CORBA::Long _oc_RTScheduling_Scheduler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f536368), 
-  ACE_NTOHL (0x6564756c), 
-  ACE_NTOHL (0x65723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Scheduler:1.0
-    10,
-  ACE_NTOHL (0x53636865), 
-  ACE_NTOHL (0x64756c65), 
-  ACE_NTOHL (0x72000000),  // name = Scheduler
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_Scheduler),
-    (char *) &_oc_RTScheduling_Scheduler,
-    0,
-    0
-  );
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES (
+    "IDL:RTScheduling/Scheduler/INCOMPATIBLE_SCHEDULING_DISCIPLINES:1.0",
+    "INCOMPATIBLE_SCHEDULING_DISCIPLINES",
+    _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
+    0);
+  
+::CORBA::TypeCode_ptr const RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
+  &_tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_RTScheduling_Scheduler (
+    "IDL:RTScheduling/Scheduler:1.0",
+    "Scheduler");
+  
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Scheduler =
-    &_tc_TAO_tc_RTScheduling_Scheduler;
+    &_tao_tc_RTScheduling_Scheduler;
 }
 
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index 66b1565ce8a..210c5cf7835 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -32,7 +32,15 @@
 #include "RTScheduler.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/Var_Size_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
@@ -52,7 +60,7 @@ namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:480
+  // be\be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
 #define _CORBA_POLICYLIST__ARG_TRAITS_CS_
@@ -457,58 +465,11 @@ void RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_type (void) const
+CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_type (void) const
 {
   return ::RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  63,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f437572), 
-  ACE_NTOHL (0x72656e74), 
-  ACE_NTOHL (0x2f554e53), 
-  ACE_NTOHL (0x5550504f), 
-  ACE_NTOHL (0x52544544), 
-  ACE_NTOHL (0x5f534348), 
-  ACE_NTOHL (0x4544554c), 
-  ACE_NTOHL (0x494e475f), 
-  ACE_NTOHL (0x44495343), 
-  ACE_NTOHL (0x49504c49), 
-  ACE_NTOHL (0x4e453a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Current/UNSUPPORTED_SCHEDULING_DISCIPLINE:1.0
-    34,
-  ACE_NTOHL (0x554e5355), 
-  ACE_NTOHL (0x50504f52), 
-  ACE_NTOHL (0x5445445f), 
-  ACE_NTOHL (0x53434845), 
-  ACE_NTOHL (0x44554c49), 
-  ACE_NTOHL (0x4e475f44), 
-  ACE_NTOHL (0x49534349), 
-  ACE_NTOHL (0x504c494e), 
-  ACE_NTOHL (0x45000000),  // name = UNSUPPORTED_SCHEDULING_DISCIPLINE
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE (
-    CORBA::tk_except,
-    sizeof (_oc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE),
-    (char *) &_oc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
-  &_tc_TAO_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -952,59 +913,11 @@ void RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_type (void) const
+CORBA::TypeCode_ptr RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_type (void) const
 {
   return ::RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  67,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x52545363), 
-  ACE_NTOHL (0x68656475), 
-  ACE_NTOHL (0x6c696e67), 
-  ACE_NTOHL (0x2f536368), 
-  ACE_NTOHL (0x6564756c), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x4e434f4d), 
-  ACE_NTOHL (0x50415449), 
-  ACE_NTOHL (0x424c455f), 
-  ACE_NTOHL (0x53434845), 
-  ACE_NTOHL (0x44554c49), 
-  ACE_NTOHL (0x4e475f44), 
-  ACE_NTOHL (0x49534349), 
-  ACE_NTOHL (0x504c494e), 
-  ACE_NTOHL (0x45533a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Scheduler/INCOMPATIBLE_SCHEDULING_DISCIPLINES:1.0
-    36,
-  ACE_NTOHL (0x494e434f), 
-  ACE_NTOHL (0x4d504154), 
-  ACE_NTOHL (0x49424c45), 
-  ACE_NTOHL (0x5f534348), 
-  ACE_NTOHL (0x4544554c), 
-  ACE_NTOHL (0x494e475f), 
-  ACE_NTOHL (0x44495343), 
-  ACE_NTOHL (0x49504c49), 
-  ACE_NTOHL (0x4e455300),  // name = INCOMPATIBLE_SCHEDULING_DISCIPLINES
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES (
-    CORBA::tk_except,
-    sizeof (_oc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES),
-    (char *) &_oc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
-    0,
-    0
-  );
-
-::CORBA::TypeCode_ptr const RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
-  &_tc_TAO_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
-
 RTScheduling::Scheduler::Scheduler (void)
 {}
 
@@ -1103,7 +1016,7 @@ RTScheduling::Scheduler::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index 9293a8a3982..093536393ab 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -448,7 +448,7 @@ namespace RTScheduling
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -872,7 +872,7 @@ namespace RTScheduling
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
       
-      virtual CORBA::TypeCode_ptr _type (void) const;
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
@@ -1289,7 +1289,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RTSchedulerC.inl"
diff --git a/TAO/tao/RTScheduling/diffs/RTScheduler.diff b/TAO/tao/RTScheduling/diffs/RTScheduler.diff
index 3b20ba20c2d..45844064c1f 100644
--- a/TAO/tao/RTScheduling/diffs/RTScheduler.diff
+++ b/TAO/tao/RTScheduling/diffs/RTScheduler.diff
@@ -1,5 +1,5 @@
---- orig/RTSchedulerC.h	2005-02-18 12:26:10.608555200 +0100
-+++ RTSchedulerC.h	2005-02-18 12:26:10.898972800 +0100
+--- orig/RTSchedulerC.h	2005-03-25 19:33:51.736793600 +0100
++++ RTSchedulerC.h	2005-03-25 19:33:52.648104000 +0100
 @@ -54,6 +54,10 @@
  #include "tao/PortableServer/PortableServer_includeC.h"
  #include "tao/PortableInterceptorC.h"
@@ -21,8 +21,8 @@
  } // module CORBA
  
  // TAO_IDL - Generated from
---- orig/RTSchedulerC.cpp	2005-02-18 12:26:10.608555200 +0100
-+++ RTSchedulerC.cpp	2005-02-18 12:26:10.919001600 +0100
+--- orig/RTSchedulerC.cpp	2005-03-25 19:33:51.736793600 +0100
++++ RTSchedulerC.cpp	2005-03-25 19:33:52.678147200 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -31,15 +31,15 @@
 +#include "RTScheduler.h"
  #include "tao/CDR.h"
  #include "tao/ORB_Core.h"
- #include "tao/Typecode.h"
---- orig/RTSchedulerA.cpp	2005-02-18 12:26:10.608555200 +0100
-+++ RTSchedulerA.cpp	2005-02-18 12:26:10.919001600 +0100
+ #include "tao/Null_RefCount_Policy.h"
+--- orig/RTSchedulerA.cpp	2005-03-25 19:33:51.736793600 +0100
++++ RTSchedulerA.cpp	2005-03-25 19:34:31.493961600 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "RTSchedulerC.h"
 +#include "RTScheduler.h"
- #include "tao/Typecode.h"
- 
- // TAO_IDL - Generated from
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+ #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
index ca5c011bb64..8491b310bec 100644
--- a/TAO/tao/ServicesA.cpp
+++ b/TAO/tao/ServicesA.cpp
@@ -26,627 +26,260 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServicesC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_ServiceType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
-    12,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636554), 
-  ACE_NTOHL (0x79706500),  // name = ServiceType
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceType),
-    (char *) &_oc_CORBA_ServiceType,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceType (
+    "IDL:omg.org/CORBA/ServiceType:1.0",
+    "ServiceType",
+    &::_tao_tc_CORBA::_tc_ushort);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceType =
-    &_tc_TAO_tc_CORBA_ServiceType;
+    &_tao_tc_CORBA_ServiceType;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_ServiceOption[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x654f7074), 
-  ACE_NTOHL (0x696f6e3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-    14,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6963654f), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e000000),  // name = ServiceOption
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceOption),
-    (char *) &_oc_CORBA_ServiceOption,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceOption (
+    "IDL:omg.org/CORBA/ServiceOption:1.0",
+    "ServiceOption",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceOption =
-    &_tc_TAO_tc_CORBA_ServiceOption;
+    &_tao_tc_CORBA_ServiceOption;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65446574), 
-  ACE_NTOHL (0x61696c54), 
-  ACE_NTOHL (0x7970653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636544), 
-  ACE_NTOHL (0x65746169), 
-  ACE_NTOHL (0x6c547970), 
-  ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceDetailType),
-    (char *) &_oc_CORBA_ServiceDetailType,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceDetailType (
+    "IDL:omg.org/CORBA/ServiceDetailType:1.0",
+    "ServiceDetailType",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceDetailType =
-    &_tc_TAO_tc_CORBA_ServiceDetailType;
+    &_tao_tc_CORBA_ServiceDetailType;
 }
 
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_CORBA_ServiceDetail[] =
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_sequence_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_octet,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OctetSeq (
+    "IDL:omg.org/CORBA/OctetSeq:1.0",
+    "OctetSeq",
+    &::_tao_tc_CORBA_sequence_0);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65446574), 
-  ACE_NTOHL (0x61696c3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636544), 
-  ACE_NTOHL (0x65746169), 
-  ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-  2, // member count
-    20,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x64657461), 
-  ACE_NTOHL (0x696c5f74), 
-  ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5365), 
-    ACE_NTOHL (0x72766963), 
-    ACE_NTOHL (0x65446574), 
-    ACE_NTOHL (0x61696c54), 
-    ACE_NTOHL (0x7970653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-        18,
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636544), 
-    ACE_NTOHL (0x65746169), 
-    ACE_NTOHL (0x6c547970), 
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-        CORBA::tk_ulong,
-
-
-  15,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x64657461), 
-  ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ServiceDetail),
-    (char *) &_oc_CORBA_ServiceDetail,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_OctetSeq =
+    &_tao_tc_CORBA_OctetSeq;
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceDetailData (
+    "IDL:omg.org/CORBA/ServiceDetailData:1.0",
+    "ServiceDetailData",
+    &CORBA::_tc_OctetSeq);
+  
 namespace CORBA
 {
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetail =
-    &_tc_TAO_tc_CORBA_ServiceDetail;
+  ::CORBA::TypeCode_ptr const _tc_ServiceDetailData =
+    &_tao_tc_CORBA_ServiceDetailData;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+
 
-static const CORBA::Long _oc_CORBA_ServiceOptionSeq[] =
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceOption (
+    "IDL:omg.org/CORBA/ServiceOption:1.0",
+    "ServiceOption",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x654f7074), 
-  ACE_NTOHL (0x696f6e53), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
-    17,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6963654f), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e536571), 
-  ACE_NTOHL (0x0),  // name = ServiceOptionSeq
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5365), 
-      ACE_NTOHL (0x72766963), 
-      ACE_NTOHL (0x654f7074), 
-      ACE_NTOHL (0x696f6e3a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-            14,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x6963654f), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e000000),  // name = ServiceOption
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceOptionSeq),
-    (char *) &_oc_CORBA_ServiceOptionSeq,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_ServiceOption =
+    &_tao_tc_CORBA_ServiceOption;
+}
 
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceOptionSeq_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_ServiceOption,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceOptionSeq (
+    "IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
+    "ServiceOptionSeq",
+    &::_tao_tc_CORBA_ServiceOptionSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq =
-    &_tc_TAO_tc_CORBA_ServiceOptionSeq;
+    &_tao_tc_CORBA_ServiceOptionSeq;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_ServiceDetailSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65446574), 
-  ACE_NTOHL (0x61696c53), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
-    17,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636544), 
-  ACE_NTOHL (0x65746169), 
-  ACE_NTOHL (0x6c536571), 
-  ACE_NTOHL (0x0),  // name = ServiceDetailSeq
-    CORBA::tk_sequence, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    280, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5365), 
-      ACE_NTOHL (0x72766963), 
-      ACE_NTOHL (0x65446574), 
-      ACE_NTOHL (0x61696c3a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-            14,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x69636544), 
-      ACE_NTOHL (0x65746169), 
-      ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-      2, // member count
-            20,
-      ACE_NTOHL (0x73657276), 
-      ACE_NTOHL (0x6963655f), 
-      ACE_NTOHL (0x64657461), 
-      ACE_NTOHL (0x696c5f74), 
-      ACE_NTOHL (0x79706500),  // name = service_detail_type
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5365), 
-        ACE_NTOHL (0x72766963), 
-        ACE_NTOHL (0x65446574), 
-        ACE_NTOHL (0x61696c54), 
-        ACE_NTOHL (0x7970653a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-                18,
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636544), 
-        ACE_NTOHL (0x65746169), 
-        ACE_NTOHL (0x6c547970), 
-        ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-                CORBA::tk_ulong,
-
-
-      15,
-      ACE_NTOHL (0x73657276), 
-      ACE_NTOHL (0x6963655f), 
-      ACE_NTOHL (0x64657461), 
-      ACE_NTOHL (0x696c0000),  // name = service_detail
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceDetailSeq),
-    (char *) &_oc_CORBA_ServiceDetailSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_ServiceDetail[] =
+  {
+    { "service_detail_type", &CORBA::_tc_ServiceDetailType },
+    { "service_detail", &CORBA::_tc_ServiceDetailData }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceDetail (
+    "IDL:omg.org/CORBA/ServiceDetail:1.0",
+    "ServiceDetail",
+    _tao_fields_CORBA_ServiceDetail,
+    2);
+  
 namespace CORBA
 {
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq =
-    &_tc_TAO_tc_CORBA_ServiceDetailSeq;
+  ::CORBA::TypeCode_ptr const _tc_ServiceDetail =
+    &_tao_tc_CORBA_ServiceDetail;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_CORBA_ServiceInformation[] =
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceDetailSeq_0 (
+    CORBA::tk_sequence,
+    &CORBA::_tc_ServiceDetail,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceDetailSeq (
+    "IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
+    "ServiceDetailSeq",
+    &::_tao_tc_CORBA_ServiceDetailSeq_0);
+  
+namespace CORBA
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65496e66), 
-  ACE_NTOHL (0x6f726d61), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
-    19,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636549), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
-  2, // member count
-    16,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x6f707469), 
-  ACE_NTOHL (0x6f6e7300),  // name = service_options
-    CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5365), 
-    ACE_NTOHL (0x72766963), 
-    ACE_NTOHL (0x654f7074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
-        17,
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x6963654f), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x0),  // name = ServiceOptionSeq
-        CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5365), 
-        ACE_NTOHL (0x72766963), 
-        ACE_NTOHL (0x654f7074), 
-        ACE_NTOHL (0x696f6e3a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-                14,
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x6963654f), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e000000),  // name = ServiceOption
-                CORBA::tk_ulong,
-
-
-      0U,
-
-
-  16,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x64657461), 
-  ACE_NTOHL (0x696c7300),  // name = service_details
-    CORBA::tk_alias, // typecode kind for typedefs
-  376, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5365), 
-    ACE_NTOHL (0x72766963), 
-    ACE_NTOHL (0x65446574), 
-    ACE_NTOHL (0x61696c53), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
-        17,
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636544), 
-    ACE_NTOHL (0x65746169), 
-    ACE_NTOHL (0x6c536571), 
-    ACE_NTOHL (0x0),  // name = ServiceDetailSeq
-        CORBA::tk_sequence, // typecode kind
-    296, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      280, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5365), 
-        ACE_NTOHL (0x72766963), 
-        ACE_NTOHL (0x65446574), 
-        ACE_NTOHL (0x61696c3a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-                14,
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636544), 
-        ACE_NTOHL (0x65746169), 
-        ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-        2, // member count
-                20,
-        ACE_NTOHL (0x73657276), 
-        ACE_NTOHL (0x6963655f), 
-        ACE_NTOHL (0x64657461), 
-        ACE_NTOHL (0x696c5f74), 
-        ACE_NTOHL (0x79706500),  // name = service_detail_type
-                CORBA::tk_alias, // typecode kind for typedefs
-        76, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5365), 
-          ACE_NTOHL (0x72766963), 
-          ACE_NTOHL (0x65446574), 
-          ACE_NTOHL (0x61696c54), 
-          ACE_NTOHL (0x7970653a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-                    18,
-          ACE_NTOHL (0x53657276), 
-          ACE_NTOHL (0x69636544), 
-          ACE_NTOHL (0x65746169), 
-          ACE_NTOHL (0x6c547970), 
-          ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-                    CORBA::tk_ulong,
-
-
-        15,
-        ACE_NTOHL (0x73657276), 
-        ACE_NTOHL (0x6963655f), 
-        ACE_NTOHL (0x64657461), 
-        ACE_NTOHL (0x696c0000),  // name = service_detail
-                CORBA::tk_alias, // typecode kind for typedefs
-        76, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          31,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f63), 
-          ACE_NTOHL (0x74657453), 
-          ACE_NTOHL (0x65713a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                    9,
-          ACE_NTOHL (0x4f637465), 
-          ACE_NTOHL (0x74536571), 
-          ACE_NTOHL (0x0),  // name = OctetSeq
-                    CORBA::tk_sequence, // typecode kind
-          12, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_octet,
-
-            0U,
-
-
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ServiceInformation),
-    (char *) &_oc_CORBA_ServiceInformation,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq =
+    &_tao_tc_CORBA_ServiceDetailSeq;
+}
+
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_ServiceInformation[] =
+  {
+    { "service_options", &CORBA::_tc_ServiceOptionSeq },
+    { "service_details", &CORBA::_tc_ServiceDetailSeq }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ServiceInformation (
+    "IDL:omg.org/CORBA/ServiceInformation:1.0",
+    "ServiceInformation",
+    _tao_fields_CORBA_ServiceInformation,
+    2);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServiceInformation =
-    &_tc_TAO_tc_CORBA_ServiceInformation;
+    &_tao_tc_CORBA_ServiceInformation;
 }
 
+
+
 // TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ServiceDetail &_tao_elem
+    const CORBA::ServiceOptionSeq &_tao_elem
   )
 {
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
+  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert_copy (
       _tao_any,
-      CORBA::ServiceDetail::_tao_any_destructor,
-      CORBA::_tc_ServiceDetail,
+      CORBA::ServiceOptionSeq::_tao_any_destructor,
+      CORBA_ServiceOptionSeq_0,
       _tao_elem
     );
 }
@@ -654,13 +287,13 @@ void operator<<= (
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::ServiceDetail *_tao_elem
+    CORBA::ServiceOptionSeq *_tao_elem
   )
 {
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
+  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert (
       _tao_any,
-      CORBA::ServiceDetail::_tao_any_destructor,
-      CORBA::_tc_ServiceDetail,
+      CORBA::ServiceOptionSeq::_tao_any_destructor,
+      CORBA_ServiceOptionSeq_0,
       _tao_elem
     );
 }
@@ -668,11 +301,11 @@ void operator<<= (
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::ServiceDetail *&_tao_elem
+    CORBA::ServiceOptionSeq *&_tao_elem
   )
 {
   return _tao_any >>= const_cast<
-      const CORBA::ServiceDetail *&> (
+      const CORBA::ServiceOptionSeq *&> (
       _tao_elem
     );
 }
@@ -680,31 +313,31 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::ServiceDetail *&_tao_elem
+    const CORBA::ServiceOptionSeq *&_tao_elem
   )
 {
   return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
+    TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::extract (
         _tao_any,
-        CORBA::ServiceDetail::_tao_any_destructor,
-        CORBA::_tc_ServiceDetail,
+        CORBA::ServiceOptionSeq::_tao_any_destructor,
+        CORBA_ServiceOptionSeq_0,
         _tao_elem
       );
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq &_tao_elem
+    const CORBA::ServiceDetail &_tao_elem
   )
 {
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert_copy (
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
       _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      CORBA::_tc_ServiceOptionSeq,
+      CORBA::ServiceDetail::_tao_any_destructor,
+      CORBA::_tc_ServiceDetail,
       _tao_elem
     );
 }
@@ -712,13 +345,13 @@ void operator<<= (
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *_tao_elem
+    CORBA::ServiceDetail *_tao_elem
   )
 {
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert (
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
       _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      CORBA::_tc_ServiceOptionSeq,
+      CORBA::ServiceDetail::_tao_any_destructor,
+      CORBA::_tc_ServiceDetail,
       _tao_elem
     );
 }
@@ -726,11 +359,11 @@ void operator<<= (
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *&_tao_elem
+    CORBA::ServiceDetail *&_tao_elem
   )
 {
   return _tao_any >>= const_cast<
-      const CORBA::ServiceOptionSeq *&> (
+      const CORBA::ServiceDetail *&> (
       _tao_elem
     );
 }
@@ -738,14 +371,14 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq *&_tao_elem
+    const CORBA::ServiceDetail *&_tao_elem
   )
 {
   return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::extract (
+    TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
         _tao_any,
-        CORBA::ServiceOptionSeq::_tao_any_destructor,
-        CORBA::_tc_ServiceOptionSeq,
+        CORBA::ServiceDetail::_tao_any_destructor,
+        CORBA::_tc_ServiceDetail,
         _tao_elem
       );
 }
@@ -762,7 +395,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert_copy (
       _tao_any,
       CORBA::ServiceDetailSeq::_tao_any_destructor,
-      CORBA::_tc_ServiceDetailSeq,
+      CORBA_ServiceDetailSeq_0,
       _tao_elem
     );
 }
@@ -776,7 +409,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert (
       _tao_any,
       CORBA::ServiceDetailSeq::_tao_any_destructor,
-      CORBA::_tc_ServiceDetailSeq,
+      CORBA_ServiceDetailSeq_0,
       _tao_elem
     );
 }
@@ -803,7 +436,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::extract (
         _tao_any,
         CORBA::ServiceDetailSeq::_tao_any_destructor,
-        CORBA::_tc_ServiceDetailSeq,
+        CORBA_ServiceDetailSeq_0,
         _tao_elem
       );
 }
@@ -870,12 +503,12 @@ CORBA::Boolean operator>>= (
 
   template class
     TAO::Any_Dual_Impl_T<
-        CORBA::ServiceDetail
+        CORBA::ServiceOptionSeq
       >;
 
   template class
     TAO::Any_Dual_Impl_T<
-        CORBA::ServiceOptionSeq
+        CORBA::ServiceDetail
       >;
 
   template class
@@ -892,12 +525,12 @@ CORBA::Boolean operator>>= (
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
-        CORBA::ServiceDetail \
+        CORBA::ServiceOptionSeq \
       >
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
-        CORBA::ServiceOptionSeq \
+        CORBA::ServiceDetail \
       >
 
 # pragma instantiate \
diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
index 2aacbfdb443..ffaba5ff031 100644
--- a/TAO/tao/ShortSeqA.cpp
+++ b/TAO/tao/ShortSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ShortSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_ShortSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5368), 
-  ACE_NTOHL (0x6f727453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ShortSeq:1.0
-    9,
-  ACE_NTOHL (0x53686f72), 
-  ACE_NTOHL (0x74536571), 
-  ACE_NTOHL (0x0),  // name = ShortSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_short,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ShortSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ShortSeq),
-    (char *) &_oc_CORBA_ShortSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ShortSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_short,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ShortSeq (
+    "IDL:omg.org/CORBA/ShortSeq:1.0",
+    "ShortSeq",
+    &::_tao_tc_CORBA_ShortSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ShortSeq =
-    &_tc_TAO_tc_CORBA_ShortSeq;
+    &_tao_tc_CORBA_ShortSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert_copy (
       _tao_any,
       CORBA::ShortSeq::_tao_any_destructor,
-      CORBA::_tc_ShortSeq,
+      CORBA_ShortSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert (
       _tao_any,
       CORBA::ShortSeq::_tao_any_destructor,
-      CORBA::_tc_ShortSeq,
+      CORBA_ShortSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::extract (
         _tao_any,
         CORBA::ShortSeq::_tao_any_destructor,
-        CORBA::_tc_ShortSeq,
+        CORBA_ShortSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
index 6b22ec209db..0296914ea6b 100644
--- a/TAO/tao/TAOA.cpp
+++ b/TAO/tao/TAOA.cpp
@@ -26,197 +26,81 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TAOC.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/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e744d), 
-  ACE_NTOHL (0x6f64653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
-    24,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e744d), 
-  ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
-    CORBA::tk_alias,
-    sizeof (_oc_TAO_BufferingConstraintMode),
-    (char *) &_oc_TAO_BufferingConstraintMode,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_BufferingConstraintMode (
+    "IDL:tao/TAO/BufferingConstraintMode:1.0",
+    "BufferingConstraintMode",
+    &::_tao_tc_CORBA::_tc_ushort);
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode =
-    &_tc_TAO_tc_TAO_BufferingConstraintMode;
+    &_tao_tc_TAO_BufferingConstraintMode;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_TAO_BufferingConstraint[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
-    20,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
-  4, // member count
-    5,
-  ACE_NTOHL (0x6d6f6465), 
-  ACE_NTOHL (0x0),  // name = mode
-    CORBA::tk_alias, // typecode kind for typedefs
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x74616f2f), 
-    ACE_NTOHL (0x54414f2f), 
-    ACE_NTOHL (0x42756666), 
-    ACE_NTOHL (0x6572696e), 
-    ACE_NTOHL (0x67436f6e), 
-    ACE_NTOHL (0x73747261), 
-    ACE_NTOHL (0x696e744d), 
-    ACE_NTOHL (0x6f64653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
-        24,
-    ACE_NTOHL (0x42756666), 
-    ACE_NTOHL (0x6572696e), 
-    ACE_NTOHL (0x67436f6e), 
-    ACE_NTOHL (0x73747261), 
-    ACE_NTOHL (0x696e744d), 
-    ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
-        CORBA::tk_ushort,
-
-
-  8,
-  ACE_NTOHL (0x74696d65), 
-  ACE_NTOHL (0x6f757400),  // name = timeout
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  14,
-  ACE_NTOHL (0x6d657373), 
-  ACE_NTOHL (0x6167655f), 
-  ACE_NTOHL (0x636f756e), 
-  ACE_NTOHL (0x74000000),  // name = message_count
-    CORBA::tk_ulong,
-
-  14,
-  ACE_NTOHL (0x6d657373), 
-  ACE_NTOHL (0x6167655f), 
-  ACE_NTOHL (0x62797465), 
-  ACE_NTOHL (0x73000000),  // name = message_bytes
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
-    CORBA::tk_struct,
-    sizeof (_oc_TAO_BufferingConstraint),
-    (char *) &_oc_TAO_BufferingConstraint,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_TAO_BufferingConstraint[] =
+  {
+    { "mode", &TAO::_tc_BufferingConstraintMode },
+    { "timeout", &TimeBase::_tc_TimeT },
+    { "message_count", &CORBA::_tc_ulong },
+    { "message_bytes", &CORBA::_tc_ulong }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_BufferingConstraint (
+    "IDL:tao/TAO/BufferingConstraint:1.0",
+    "BufferingConstraint",
+    _tao_fields_TAO_BufferingConstraint,
+    4);
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_BufferingConstraint =
-    &_tc_TAO_tc_TAO_BufferingConstraint;
+    &_tao_tc_TAO_BufferingConstraint;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
-    26,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
-  };
 
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_TAO_BufferingConstraintPolicy),
-    (char *) &_oc_TAO_BufferingConstraintPolicy,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_BufferingConstraintPolicy (
+    "IDL:tao/TAO/BufferingConstraintPolicy:1.0",
+    "BufferingConstraintPolicy");
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy =
-    &_tc_TAO_tc_TAO_BufferingConstraintPolicy;
+    &_tao_tc_TAO_BufferingConstraintPolicy;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -278,7 +162,7 @@ CORBA::Boolean operator>>= (
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -288,14 +172,14 @@ TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
 {
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
index 4f95a2e8ce0..5a0cc312917 100644
--- a/TAO/tao/TimeBaseA.cpp
+++ b/TAO/tao/TimeBaseA.cpp
@@ -26,305 +26,143 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TimeBaseC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_TimeBase_TimeT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f54696d), 
-  ACE_NTOHL (0x65543a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
-    CORBA::tk_alias,
-    sizeof (_oc_TimeBase_TimeT),
-    (char *) &_oc_TimeBase_TimeT,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_TimeT (
+    "IDL:omg.org/TimeBase/TimeT:1.0",
+    "TimeT",
+    &::_tao_tc_CORBA::_tc_ulonglong);
+  
 namespace TimeBase
 {
   ::CORBA::TypeCode_ptr const _tc_TimeT =
-    &_tc_TAO_tc_TimeBase_TimeT;
+    &_tao_tc_TimeBase_TimeT;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_TimeT (
+    "IDL:omg.org/TimeBase/TimeT:1.0",
+    "TimeT",
+    &::_tao_tc_CORBA::_tc_ulonglong);
+  
+namespace TimeBase
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f496e61), 
-  ACE_NTOHL (0x63637572), 
-  ACE_NTOHL (0x61637954), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
-    12,
-  ACE_NTOHL (0x496e6163), 
-  ACE_NTOHL (0x63757261), 
-  ACE_NTOHL (0x63795400),  // name = InaccuracyT
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
-    CORBA::tk_alias,
-    sizeof (_oc_TimeBase_InaccuracyT),
-    (char *) &_oc_TimeBase_InaccuracyT,
-    0,
-    0
-  );
+  ::CORBA::TypeCode_ptr const _tc_TimeT =
+    &_tao_tc_TimeBase_TimeT;
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_InaccuracyT (
+    "IDL:omg.org/TimeBase/InaccuracyT:1.0",
+    "InaccuracyT",
+    &TimeBase::_tc_TimeT);
+  
 namespace TimeBase
 {
   ::CORBA::TypeCode_ptr const _tc_InaccuracyT =
-    &_tc_TAO_tc_TimeBase_InaccuracyT;
+    &_tao_tc_TimeBase_InaccuracyT;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_TimeBase_TdfT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f546466), 
-  ACE_NTOHL (0x543a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-    5,
-  ACE_NTOHL (0x54646654), 
-  ACE_NTOHL (0x0),  // name = TdfT
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
-    CORBA::tk_alias,
-    sizeof (_oc_TimeBase_TdfT),
-    (char *) &_oc_TimeBase_TdfT,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_TdfT (
+    "IDL:omg.org/TimeBase/TdfT:1.0",
+    "TdfT",
+    &::_tao_tc_CORBA::_tc_short);
+  
 namespace TimeBase
 {
   ::CORBA::TypeCode_ptr const _tc_TdfT =
-    &_tc_TAO_tc_TimeBase_TdfT;
+    &_tao_tc_TimeBase_TdfT;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_TimeBase_UtcT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f557463), 
-  ACE_NTOHL (0x543a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
-    5,
-  ACE_NTOHL (0x55746354), 
-  ACE_NTOHL (0x0),  // name = UtcT
-  4, // member count
-    5,
-  ACE_NTOHL (0x74696d65), 
-  ACE_NTOHL (0x0),  // name = time
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  8,
-  ACE_NTOHL (0x696e6163), 
-  ACE_NTOHL (0x636c6f00),  // name = inacclo
-    CORBA::tk_ulong,
-
-  8,
-  ACE_NTOHL (0x696e6163), 
-  ACE_NTOHL (0x63686900),  // name = inacchi
-    CORBA::tk_ushort,
-
-  4,
-  ACE_NTOHL (0x74646600),  // name = tdf
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f546466), 
-    ACE_NTOHL (0x543a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-        5,
-    ACE_NTOHL (0x54646654), 
-    ACE_NTOHL (0x0),  // name = TdfT
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
-    CORBA::tk_struct,
-    sizeof (_oc_TimeBase_UtcT),
-    (char *) &_oc_TimeBase_UtcT,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_TimeBase_UtcT[] =
+  {
+    { "time", &TimeBase::_tc_TimeT },
+    { "inacclo", &CORBA::_tc_ulong },
+    { "inacchi", &CORBA::_tc_ushort },
+    { "tdf", &TimeBase::_tc_TdfT }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_UtcT (
+    "IDL:omg.org/TimeBase/UtcT:1.0",
+    "UtcT",
+    _tao_fields_TimeBase_UtcT,
+    4);
+  
 namespace TimeBase
 {
   ::CORBA::TypeCode_ptr const _tc_UtcT =
-    &_tc_TAO_tc_TimeBase_UtcT;
+    &_tao_tc_TimeBase_UtcT;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_TimeBase_IntervalT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f496e74), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6c543a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
-    10,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x7276616c), 
-  ACE_NTOHL (0x54000000),  // name = IntervalT
-  2, // member count
-    12,
-  ACE_NTOHL (0x6c6f7765), 
-  ACE_NTOHL (0x725f626f), 
-  ACE_NTOHL (0x756e6400),  // name = lower_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  12,
-  ACE_NTOHL (0x75707065), 
-  ACE_NTOHL (0x725f626f), 
-  ACE_NTOHL (0x756e6400),  // name = upper_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
-    CORBA::tk_struct,
-    sizeof (_oc_TimeBase_IntervalT),
-    (char *) &_oc_TimeBase_IntervalT,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_TimeBase_IntervalT[] =
+  {
+    { "lower_bound", &TimeBase::_tc_TimeT },
+    { "upper_bound", &TimeBase::_tc_TimeT }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_struct,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TimeBase_IntervalT (
+    "IDL:omg.org/TimeBase/IntervalT:1.0",
+    "IntervalT",
+    _tao_fields_TimeBase_IntervalT,
+    2);
+  
 namespace TimeBase
 {
   ::CORBA::TypeCode_ptr const _tc_IntervalT =
-    &_tc_TAO_tc_TimeBase_IntervalT;
+    &_tao_tc_TimeBase_IntervalT;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp
index 1cb73478413..3c9aafd9edd 100644
--- a/TAO/tao/ULongLongSeqA.cpp
+++ b/TAO/tao/ULongLongSeqA.cpp
@@ -26,55 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ULongLongSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_ULongLongSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f554c), 
-  ACE_NTOHL (0x6f6e674c), 
-  ACE_NTOHL (0x6f6e6753), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ULongLongSeq:1.0
-    13,
-  ACE_NTOHL (0x554c6f6e), 
-  ACE_NTOHL (0x674c6f6e), 
-  ACE_NTOHL (0x67536571), 
-  ACE_NTOHL (0x0),  // name = ULongLongSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_ulonglong,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongLongSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ULongLongSeq),
-    (char *) &_oc_CORBA_ULongLongSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ULongLongSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_ulonglong,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ULongLongSeq (
+    "IDL:omg.org/CORBA/ULongLongSeq:1.0",
+    "ULongLongSeq",
+    &::_tao_tc_CORBA_ULongLongSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ULongLongSeq =
-    &_tc_TAO_tc_CORBA_ULongLongSeq;
+    &_tao_tc_CORBA_ULongLongSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -87,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert_copy (
       _tao_any,
       CORBA::ULongLongSeq::_tao_any_destructor,
-      CORBA::_tc_ULongLongSeq,
+      CORBA_ULongLongSeq_0,
       _tao_elem
     );
 }
@@ -101,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert (
       _tao_any,
       CORBA::ULongLongSeq::_tao_any_destructor,
-      CORBA::_tc_ULongLongSeq,
+      CORBA_ULongLongSeq_0,
       _tao_elem
     );
 }
@@ -128,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::extract (
         _tao_any,
         CORBA::ULongLongSeq::_tao_any_destructor,
-        CORBA::_tc_ULongLongSeq,
+        CORBA_ULongLongSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
index 1b75f97262e..b8584876b13 100644
--- a/TAO/tao/ULongSeqA.cpp
+++ b/TAO/tao/ULongSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ULongSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_ULongSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f554c), 
-  ACE_NTOHL (0x6f6e6753), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ULongSeq:1.0
-    9,
-  ACE_NTOHL (0x554c6f6e), 
-  ACE_NTOHL (0x67536571), 
-  ACE_NTOHL (0x0),  // name = ULongSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_ulong,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ULongSeq),
-    (char *) &_oc_CORBA_ULongSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ULongSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_ulong,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ULongSeq (
+    "IDL:omg.org/CORBA/ULongSeq:1.0",
+    "ULongSeq",
+    &::_tao_tc_CORBA_ULongSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ULongSeq =
-    &_tc_TAO_tc_CORBA_ULongSeq;
+    &_tao_tc_CORBA_ULongSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert_copy (
       _tao_any,
       CORBA::ULongSeq::_tao_any_destructor,
-      CORBA::_tc_ULongSeq,
+      CORBA_ULongSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert (
       _tao_any,
       CORBA::ULongSeq::_tao_any_destructor,
-      CORBA::_tc_ULongSeq,
+      CORBA_ULongSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::extract (
         _tao_any,
         CORBA::ULongSeq::_tao_any_destructor,
-        CORBA::_tc_ULongSeq,
+        CORBA_ULongSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
index d5923c56744..c699215b92d 100644
--- a/TAO/tao/UShortSeqA.cpp
+++ b/TAO/tao/UShortSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "UShortSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_UShortSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5553), 
-  ACE_NTOHL (0x686f7274), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
-    10,
-  ACE_NTOHL (0x5553686f), 
-  ACE_NTOHL (0x72745365), 
-  ACE_NTOHL (0x71000000),  // name = UShortSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_ushort,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UShortSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_UShortSeq),
-    (char *) &_oc_CORBA_UShortSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UShortSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_ushort,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UShortSeq (
+    "IDL:omg.org/CORBA/UShortSeq:1.0",
+    "UShortSeq",
+    &::_tao_tc_CORBA_UShortSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UShortSeq =
-    &_tc_TAO_tc_CORBA_UShortSeq;
+    &_tao_tc_CORBA_UShortSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy (
       _tao_any,
       CORBA::UShortSeq::_tao_any_destructor,
-      CORBA::_tc_UShortSeq,
+      CORBA_UShortSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert (
       _tao_any,
       CORBA::UShortSeq::_tao_any_destructor,
-      CORBA::_tc_UShortSeq,
+      CORBA_UShortSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract (
         _tao_any,
         CORBA::UShortSeq::_tao_any_destructor,
-        CORBA::_tc_UShortSeq,
+        CORBA_UShortSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp
index 573314d3303..d6e7291615e 100644
--- a/TAO/tao/WCharSeqA.cpp
+++ b/TAO/tao/WCharSeqA.cpp
@@ -26,53 +26,43 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "WCharSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_WCharSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5743), 
-  ACE_NTOHL (0x68617253), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WCharSeq:1.0
-    9,
-  ACE_NTOHL (0x57436861), 
-  ACE_NTOHL (0x72536571), 
-  ACE_NTOHL (0x0),  // name = WCharSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wchar,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WCharSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_WCharSeq),
-    (char *) &_oc_CORBA_WCharSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WCharSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_wchar,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WCharSeq (
+    "IDL:omg.org/CORBA/WCharSeq:1.0",
+    "WCharSeq",
+    &::_tao_tc_CORBA_WCharSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_WCharSeq =
-    &_tc_TAO_tc_CORBA_WCharSeq;
+    &_tao_tc_CORBA_WCharSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -85,7 +75,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert_copy (
       _tao_any,
       CORBA::WCharSeq::_tao_any_destructor,
-      CORBA::_tc_WCharSeq,
+      CORBA_WCharSeq_0,
       _tao_elem
     );
 }
@@ -99,7 +89,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert (
       _tao_any,
       CORBA::WCharSeq::_tao_any_destructor,
-      CORBA::_tc_WCharSeq,
+      CORBA_WCharSeq_0,
       _tao_elem
     );
 }
@@ -126,7 +116,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::extract (
         _tao_any,
         CORBA::WCharSeq::_tao_any_destructor,
-        CORBA::_tc_WCharSeq,
+        CORBA_WCharSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp
index daf9c8a3f76..a2f64f0820e 100644
--- a/TAO/tao/WStringSeqA.cpp
+++ b/TAO/tao/WStringSeqA.cpp
@@ -26,54 +26,44 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "WStringSeqC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
 
-static const CORBA::Long _oc_CORBA_WStringSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5753), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
-    11,
-  ACE_NTOHL (0x57537472), 
-  ACE_NTOHL (0x696e6753), 
-  ACE_NTOHL (0x65710000),  // name = WStringSeq
-    CORBA::tk_sequence, // typecode kind
-  16, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wstring, 
-    0U, // string length
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_WStringSeq),
-    (char *) &_oc_CORBA_WStringSeq,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:744
+
+static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WStringSeq_0 (
+    CORBA::tk_sequence,
+    &::_tao_tc_CORBA::_tc_wstring,
+    0U);
+  
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WStringSeq (
+    "IDL:omg.org/CORBA/WStringSeq:1.0",
+    "WStringSeq",
+    &::_tao_tc_CORBA_WStringSeq_0);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_WStringSeq =
-    &_tc_TAO_tc_CORBA_WStringSeq;
+    &_tao_tc_CORBA_WStringSeq;
 }
 
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -86,7 +76,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
       _tao_any,
       CORBA::WStringSeq::_tao_any_destructor,
-      CORBA::_tc_WStringSeq,
+      CORBA_WStringSeq_0,
       _tao_elem
     );
 }
@@ -100,7 +90,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
       _tao_any,
       CORBA::WStringSeq::_tao_any_destructor,
-      CORBA::_tc_WStringSeq,
+      CORBA_WStringSeq_0,
       _tao_elem
     );
 }
@@ -127,7 +117,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
         _tao_any,
         CORBA::WStringSeq::_tao_any_destructor,
-        CORBA::_tc_WStringSeq,
+        CORBA_WStringSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index 5b6befdf429..30c27a5a9f0 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -26,15 +26,44 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "WrongTransactionC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_WrongTransaction[] =
+  {
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WrongTransaction (
+    "IDL:omg.org/CORBA/WrongTransaction:1.0",
+    "WrongTransaction",
+    _tao_fields_CORBA_WrongTransaction,
+    0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_WrongTransaction =
+    &_tao_tc_CORBA_WrongTransaction;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
     TAO_InputCDR & cdr
diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp
index 08a2f11a7c0..d04c66736c4 100644
--- a/TAO/tao/orb_typesA.cpp
+++ b/TAO/tao/orb_typesA.cpp
@@ -26,153 +26,81 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "orb_typesC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_CORBA_ORBid[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x4269643a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
-    6,
-  ACE_NTOHL (0x4f524269), 
-  ACE_NTOHL (0x64000000),  // name = ORBid
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORBid (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ORBid),
-    (char *) &_oc_CORBA_ORBid,
-    0,
-    0
-  );
-
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ORBid (
+    "IDL:omg.org/CORBA/ORBid:1.0",
+    "ORBid",
+    &::_tao_tc_CORBA::_tc_string);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ORBid =
-    &_tc_TAO_tc_CORBA_ORBid;
+    &_tao_tc_CORBA_ORBid;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_Flags[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f466c), 
-  ACE_NTOHL (0x6167733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Flags:1.0
-    6,
-  ACE_NTOHL (0x466c6167), 
-  ACE_NTOHL (0x73000000),  // name = Flags
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Flags (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_Flags),
-    (char *) &_oc_CORBA_Flags,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Flags (
+    "IDL:omg.org/CORBA/Flags:1.0",
+    "Flags",
+    &::_tao_tc_CORBA::_tc_ulong);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Flags =
-    &_tc_TAO_tc_CORBA_Flags;
+    &_tao_tc_CORBA_Flags;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_Identifier[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4964), 
-  ACE_NTOHL (0x656e7469), 
-  ACE_NTOHL (0x66696572), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-  ACE_NTOHL (0x4964656e), 
-  ACE_NTOHL (0x74696669), 
-  ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_Identifier),
-    (char *) &_oc_CORBA_Identifier,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Identifier (
+    "IDL:omg.org/CORBA/Identifier:1.0",
+    "Identifier",
+    &::_tao_tc_CORBA::_tc_string);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Identifier =
-    &_tc_TAO_tc_CORBA_Identifier;
+    &_tao_tc_CORBA_Identifier;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
 
-static const CORBA::Long _oc_CORBA_RepositoryId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x49643a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
-  ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_RepositoryId),
-    (char *) &_oc_CORBA_RepositoryId,
-    0,
-    0
-  );
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_RepositoryId (
+    "IDL:omg.org/CORBA/RepositoryId:1.0",
+    "RepositoryId",
+    &::_tao_tc_CORBA::_tc_string);
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_RepositoryId =
-    &_tc_TAO_tc_CORBA_RepositoryId;
+    &_tao_tc_CORBA_RepositoryId;
 }
+
+