ChangeLogTag:Tue Sep 2 16:32:01 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

18 files changed, 6516 insertions, 6407 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 3e50e1523e1..4bac44f6abc 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,24 @@
+Tue Sep  2 16:32:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+	* tao/RTCORBA/RTCORBAC.cpp:
+	* tao/RTCORBA/RTCORBAC.h:
+	* tao/RTCORBA/RTCORBAC.i:
+	* tao/RTPortableServer/RTPortableServerC.cpp:
+	* tao/RTPortableServer/RTPortableServerC.h:
+	* tao/RTPortableServer/RTPortableServerC.i:
+	* tao/RTScheduling/Current.h:
+	* tao/RTScheduling/RTScheduler.pidl:
+	* tao/RTScheduling/RTSchedulerC.cpp:
+	* tao/RTScheduling/RTSchedulerC.h:
+	* tao/RTScheduling/RTSchedulerC.i:
+	* tao/RTScheduling/RTScheduler_Manager.h:
+	* tao/TypeCodeFactory/TypeCodeFactory.pidl:
+	* tao/TypeCodeFactory/TypeCodeFactoryC.cpp:
+	* tao/TypeCodeFactory/TypeCodeFactoryC.h:
+	* tao/TypeCodeFactory/TypeCodeFactoryC.inl: Generated and
+	  handcrafted code.
+
 Tue Sep  2 11:46:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/TAO.dsp:
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index 8c92420b7c9..1f02d28ace2 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -38,6 +38,9 @@ class TAO_Network_Priority_Mapping_Manager_var;
 typedef TAO_Network_Priority_Mapping_Manager *TAO_Network_Priority_Mapping_Manager_ptr;
 
 
+namespace RTCORBA
+{
+}
 /**
  * @class TAO_Network_Priority_Mapping_Manager
  *
@@ -165,4 +168,3 @@ private:
 
 #include /**/ "ace/post.h"
 #endif /* TAO_NETWORK_PRIORITY_MAPPING_MANAGER_H */
-
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 481630f4999..155d9e3ceca 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -26,23 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+// be/be_codegen.cpp:301
 
 
 #include "RTCORBA.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -52,6 +50,224 @@
 #include "RTCORBAC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// be/be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_RTCORBA_THREADPOOLLANE___ARG_TRAITS_CS_)
+#define __TAO_SEQ_RTCORBA_THREADPOOLLANE___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::ThreadpoolLanes>
+    : public
+        Var_Size_Arg_Traits_T<
+            RTCORBA::ThreadpoolLanes,
+            RTCORBA::ThreadpoolLanes_var,
+            RTCORBA::ThreadpoolLanes_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:390
+
+#if !defined (_RTCORBA_PRIORITYMODEL__ARG_TRAITS_CS_)
+#define _RTCORBA_PRIORITYMODEL__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::PriorityModel>
+    : public
+        Basic_Arg_Traits_T<
+            RTCORBA::PriorityModel
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_PRIORITYMODELPOLICY__ARG_TRAITS_CS_)
+#define _RTCORBA_PRIORITYMODELPOLICY__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::PriorityModelPolicy>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::PriorityModelPolicy_ptr,
+            RTCORBA::PriorityModelPolicy_var,
+            RTCORBA::PriorityModelPolicy_out,
+            TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_THREADPOOLPOLICY__ARG_TRAITS_CS_)
+#define _RTCORBA_THREADPOOLPOLICY__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::ThreadpoolPolicy>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::ThreadpoolPolicy_ptr,
+            RTCORBA::ThreadpoolPolicy_var,
+            RTCORBA::ThreadpoolPolicy_out,
+            TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_RTCORBA_PROTOCOL___ARG_TRAITS_CS_)
+#define __TAO_SEQ_RTCORBA_PROTOCOL___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::ProtocolList>
+    : public
+        Var_Size_Arg_Traits_T<
+            RTCORBA::ProtocolList,
+            RTCORBA::ProtocolList_var,
+            RTCORBA::ProtocolList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__ARG_TRAITS_CS_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::ServerProtocolPolicy>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::ServerProtocolPolicy_ptr,
+            RTCORBA::ServerProtocolPolicy_var,
+            RTCORBA::ServerProtocolPolicy_out,
+            TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__ARG_TRAITS_CS_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::ClientProtocolPolicy>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::ClientProtocolPolicy_ptr,
+            RTCORBA::ClientProtocolPolicy_var,
+            RTCORBA::ClientProtocolPolicy_out,
+            TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__ARG_TRAITS_CS_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::PrivateConnectionPolicy>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::PrivateConnectionPolicy_ptr,
+            RTCORBA::PrivateConnectionPolicy_var,
+            RTCORBA::PrivateConnectionPolicy_out,
+            TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__ARG_TRAITS_CS_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::TCPProtocolProperties>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::TCPProtocolProperties_ptr,
+            RTCORBA::TCPProtocolProperties_var,
+            RTCORBA::TCPProtocolProperties_out,
+            TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_RTCORBA_PRIORITYBAND___ARG_TRAITS_CS_)
+#define __TAO_SEQ_RTCORBA_PRIORITYBAND___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::PriorityBands>
+    : public
+        Var_Size_Arg_Traits_T<
+            RTCORBA::PriorityBands,
+            RTCORBA::PriorityBands_var,
+            RTCORBA::PriorityBands_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ARG_TRAITS_CS_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::PriorityBandedConnectionPolicy>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::PriorityBandedConnectionPolicy_ptr,
+            RTCORBA::PriorityBandedConnectionPolicy_var,
+            RTCORBA::PriorityBandedConnectionPolicy_out,
+            TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_MUTEX__ARG_TRAITS_CS_)
+#define _RTCORBA_MUTEX__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTCORBA_Export Arg_Traits<RTCORBA::Mutex>
+    : public
+        Object_Arg_Traits_T<
+            RTCORBA::Mutex_ptr,
+            RTCORBA::Mutex_var,
+            RTCORBA::Mutex_out,
+            TAO::Objref_Traits<RTCORBA::Mutex>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
 //////////////////////////////////////////////////////
 // CDR Encoding Support
 
@@ -67,27 +283,28 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
   return 1;
 }
 
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
   ACE_NTOHL (0x74790000),  // name = NativePriority
     CORBA::tk_short,
 
@@ -101,34 +318,31 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority (
     sizeof (RTCORBA::NativePriority)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_NativePriority,
-    &_tc_TAO_tc_RTCORBA_NativePriority
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_NativePriority =
+    &_tc_TAO_tc_RTCORBA_NativePriority;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x5072696f),
+  ACE_NTOHL (0x72697479),
   ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -142,36 +356,33 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority (
     sizeof (RTCORBA::Priority)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Priority,
-    &_tc_TAO_tc_RTCORBA_Priority
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Priority =
+    &_tc_TAO_tc_RTCORBA_Priority;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
   ACE_NTOHL (0x69747900),  // name = NetworkPriority
     CORBA::tk_long,
 
@@ -185,36 +396,33 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NetworkPriority (
     sizeof (RTCORBA::NetworkPriority)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_NetworkPriority,
-    &_tc_TAO_tc_RTCORBA_NetworkPriority
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_NetworkPriority =
+    &_tc_TAO_tc_RTCORBA_NetworkPriority;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
   ACE_NTOHL (0x0),  // name = ThreadpoolId
     CORBA::tk_ulong,
 
@@ -228,74 +436,71 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId (
     sizeof (RTCORBA::ThreadpoolId)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadpoolId,
-    &_tc_TAO_tc_RTCORBA_ThreadpoolId
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolId =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolId;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (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 (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 (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 (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   15,
-  ACE_NTOHL (0x73746174), 
-  ACE_NTOHL (0x69635f74), 
-  ACE_NTOHL (0x68726561), 
+  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 (0x64796e61),
+  ACE_NTOHL (0x6d69635f),
+  ACE_NTOHL (0x74687265),
   ACE_NTOHL (0x61647300),  // name = dynamic_threads
     CORBA::tk_ulong,
 
@@ -309,53 +514,27 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane (
     sizeof (RTCORBA::ThreadpoolLane)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadpoolLane,
-    &_tc_TAO_tc_RTCORBA_ThreadpoolLane
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer)
+namespace RTCORBA
 {
-  ThreadpoolLane *tmp = ACE_static_cast (ThreadpoolLane*, _tao_void_pointer);
-  delete tmp;
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolLane =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolLane;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:292
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_Fixed_Var_T<
-      RTCORBA::ThreadpoolLane
-    >;
+// be/be_visitor_structure/structure_cs.cpp:66
 
-template class TAO_Var_Base_T<
-    RTCORBA::ThreadpoolLane
-  >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_Fixed_Var_T< \
-      RTCORBA::ThreadpoolLane \
-    >
-
-#pragma instantiate TAO_Var_Base_T<
-    RTCORBA::ThreadpoolLane
-  >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+void
+RTCORBA::ThreadpoolLane::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  ThreadpoolLane *_tao_tmp_pointer =
+    ACE_static_cast (ThreadpoolLane *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:72
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CS_)
 #define _RTCORBA_THREADPOOLLANES_CS_
@@ -400,100 +579,34 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  ThreadpoolLanes * tmp =
-    ACE_static_cast (
-        ThreadpoolLanes *,
-        _tao_void_pointer
-      );
-  delete tmp;
+  ThreadpoolLanes * _tao_tmp_pointer =
+    ACE_static_cast (ThreadpoolLanes *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_FixedSeq_Var_T<
-      RTCORBA::ThreadpoolLanes,
-      RTCORBA::ThreadpoolLane
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      RTCORBA::ThreadpoolLanes,
-      RTCORBA::ThreadpoolLane
-    >;
-
-template class
-  TAO_Seq_Out_T<
-      RTCORBA::ThreadpoolLanes,
-      RTCORBA::ThreadpoolLanes_var,
-      RTCORBA::ThreadpoolLane
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_FixedSeq_Var_T< \
-      ThreadpoolLanes, \
-      RTCORBA::ThreadpoolLane \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      ThreadpoolLanes, \
-      RTCORBA::ThreadpoolLane \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      ThreadpoolLanes, \
-      ThreadpoolLanes_var, \
-      RTCORBA::ThreadpoolLane \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_THREADPOOLLANE_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_THREADPOOLLANE_CS_
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<
-    RTCORBA::ThreadpoolLane
-  >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<
-    RTCORBA::ThreadpoolLane
-  >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#endif /* end #if !defined */
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
   ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
     CORBA::tk_sequence, // typecode kind
   228, // encapsulation length
@@ -502,58 +615,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
     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 (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 (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 (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 (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 (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       15,
-      ACE_NTOHL (0x73746174), 
-      ACE_NTOHL (0x69635f74), 
-      ACE_NTOHL (0x68726561), 
+      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 (0x64796e61),
+      ACE_NTOHL (0x6d69635f),
+      ACE_NTOHL (0x74687265),
       ACE_NTOHL (0x61647300),  // name = dynamic_threads
             CORBA::tk_ulong,
 
@@ -570,48 +683,45 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes (
     sizeof (RTCORBA::ThreadpoolLanes)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadpoolLanes,
-    &_tc_TAO_tc_RTCORBA_ThreadpoolLanes
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolLanes;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (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 (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 (0x53455256),
+  ACE_NTOHL (0x45525f44),
+  ACE_NTOHL (0x45434c41),
   ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
   };
 
@@ -623,98 +733,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel (
     sizeof (RTCORBA::PriorityModel)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PriorityModel,
-    &_tc_TAO_tc_RTCORBA_PriorityModel
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityModel =
+    &_tc_TAO_tc_RTCORBA_PriorityModel;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::PriorityModelPolicy::_tao_class_id = 0;
+// Traits specializations for RTCORBA::PriorityModelPolicy.
 
 RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::tao_PriorityModelPolicy_life::tao_duplicate (
-    PriorityModelPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_duplicate (
+    RTCORBA::PriorityModelPolicy_ptr p
   )
 {
-  return PriorityModelPolicy::_duplicate (p);
+  return RTCORBA::PriorityModelPolicy::_duplicate (p);
 }
 
 void
-RTCORBA::tao_PriorityModelPolicy_life::tao_release (
-    PriorityModelPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_release (
+    RTCORBA::PriorityModelPolicy_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::tao_PriorityModelPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_nil (void)
 {
-  return PriorityModelPolicy::_nil ();
+  return RTCORBA::PriorityModelPolicy::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_PriorityModelPolicy_life::tao_marshal (
-    PriorityModelPolicy_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_marshal (
+    RTCORBA::PriorityModelPolicy_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::tao_PriorityModelPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_PriorityModelPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  PriorityModelPolicy **tmp =
-    ACE_static_cast (PriorityModelPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::PriorityModelPolicy,
-        RTCORBA::tao_PriorityModelPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::PriorityModelPolicy,
-        RTCORBA::tao_PriorityModelPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::PriorityModelPolicy, \
-        RTCORBA::tao_PriorityModelPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::PriorityModelPolicy, \
-        RTCORBA::tao_PriorityModelPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_PriorityModelPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 {}
@@ -722,43 +787,24 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PriorityModelPolicy *tmp = ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  PriorityModelPolicy *_tao_tmp_pointer =
+    ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PriorityModelPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::PriorityModelPolicy_ptr 
-RTCORBA::PriorityModelPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return PriorityModelPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          PriorityModelPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &PriorityModelPolicy::_tao_class_id
-                )
-            )
-        );
+  PriorityModelPolicy_ptr proxy =
+    dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::PriorityModelPolicy_ptr
@@ -768,53 +814,41 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::PriorityModelPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, PriorityModelPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::PriorityModelPolicy::_interface_repository_id (void) const
@@ -829,28 +863,28 @@ RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c506f6c),
   ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
   };
 
@@ -862,98 +896,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModelPolicy (
     sizeof (RTCORBA::PriorityModelPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PriorityModelPolicy,
-    &_tc_TAO_tc_RTCORBA_PriorityModelPolicy
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy =
+    &_tc_TAO_tc_RTCORBA_PriorityModelPolicy;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::ThreadpoolPolicy::_tao_class_id = 0;
+// Traits specializations for RTCORBA::ThreadpoolPolicy.
 
 RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::tao_ThreadpoolPolicy_life::tao_duplicate (
-    ThreadpoolPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_duplicate (
+    RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
-  return ThreadpoolPolicy::_duplicate (p);
+  return RTCORBA::ThreadpoolPolicy::_duplicate (p);
 }
 
 void
-RTCORBA::tao_ThreadpoolPolicy_life::tao_release (
-    ThreadpoolPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_release (
+    RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::tao_ThreadpoolPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_nil (void)
 {
-  return ThreadpoolPolicy::_nil ();
+  return RTCORBA::ThreadpoolPolicy::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_ThreadpoolPolicy_life::tao_marshal (
-    ThreadpoolPolicy_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_marshal (
+    RTCORBA::ThreadpoolPolicy_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::tao_ThreadpoolPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_ThreadpoolPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  ThreadpoolPolicy **tmp =
-    ACE_static_cast (ThreadpoolPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::ThreadpoolPolicy,
-        RTCORBA::tao_ThreadpoolPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::ThreadpoolPolicy,
-        RTCORBA::tao_ThreadpoolPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::ThreadpoolPolicy, \
-        RTCORBA::tao_ThreadpoolPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::ThreadpoolPolicy, \
-        RTCORBA::tao_ThreadpoolPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_ThreadpoolPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 {}
@@ -961,43 +950,24 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ThreadpoolPolicy *tmp = ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ThreadpoolPolicy *_tao_tmp_pointer =
+    ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ThreadpoolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ThreadpoolPolicy_ptr 
-RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ThreadpoolPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          ThreadpoolPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ThreadpoolPolicy::_tao_class_id
-                )
-            )
-        );
+  ThreadpoolPolicy_ptr proxy =
+    dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
@@ -1007,53 +977,41 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::ThreadpoolPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ThreadpoolPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const
@@ -1068,28 +1026,28 @@ RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
   };
 
@@ -1101,98 +1059,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolPolicy (
     sizeof (RTCORBA::ThreadpoolPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadpoolPolicy,
-    &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::ProtocolProperties::_tao_class_id = 0;
+// Traits specializations for RTCORBA::ProtocolProperties.
 
 RTCORBA::ProtocolProperties_ptr
-RTCORBA::tao_ProtocolProperties_life::tao_duplicate (
-    ProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_duplicate (
+    RTCORBA::ProtocolProperties_ptr p
   )
 {
-  return ProtocolProperties::_duplicate (p);
+  return RTCORBA::ProtocolProperties::_duplicate (p);
 }
 
 void
-RTCORBA::tao_ProtocolProperties_life::tao_release (
-    ProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_release (
+    RTCORBA::ProtocolProperties_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::ProtocolProperties_ptr
-RTCORBA::tao_ProtocolProperties_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_nil (void)
 {
-  return ProtocolProperties::_nil ();
+  return RTCORBA::ProtocolProperties::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_ProtocolProperties_life::tao_marshal (
-    ProtocolProperties_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_marshal (
+    RTCORBA::ProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::ProtocolProperties_ptr
-RTCORBA::tao_ProtocolProperties_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_ProtocolProperties_cast::tao_upcast (
-    void *src
-  )
-{
-  ProtocolProperties **tmp =
-    ACE_static_cast (ProtocolProperties **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::ProtocolProperties,
-        RTCORBA::tao_ProtocolProperties_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::ProtocolProperties,
-        RTCORBA::tao_ProtocolProperties_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::ProtocolProperties, \
-        RTCORBA::tao_ProtocolProperties_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::ProtocolProperties, \
-        RTCORBA::tao_ProtocolProperties_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_ProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::ProtocolProperties::ProtocolProperties (void)
 {}
@@ -1200,43 +1113,24 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ProtocolProperties *tmp = ACE_static_cast (ProtocolProperties *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ProtocolProperties *_tao_tmp_pointer =
+    ACE_static_cast (ProtocolProperties *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ProtocolProperties_ptr 
-RTCORBA::ProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ProtocolProperties::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          ProtocolProperties_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ProtocolProperties::_tao_class_id
-                )
-            )
-        );
+  ProtocolProperties_ptr proxy =
+    dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::ProtocolProperties_ptr
@@ -1246,39 +1140,37 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::ProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
@@ -1293,28 +1185,28 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = ProtocolProperties
   };
 
@@ -1326,100 +1218,117 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolProperties (
     sizeof (RTCORBA::ProtocolProperties)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ProtocolProperties,
-    &_tc_TAO_tc_RTCORBA_ProtocolProperties
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_ProtocolProperties;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
   ACE_NTOHL (0x0),  // name = Protocol
   3, // member count
     14,
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f747970), 
+  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 (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 (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 (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 (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 (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 (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
-    0xffffffff, // indirection
-  0xffffff84, // negative offset (-124)
+    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
+
 };
 
 static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
@@ -1430,65 +1339,27 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
     sizeof (RTCORBA::Protocol)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Protocol,
-    &_tc_TAO_tc_RTCORBA_Protocol
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void RTCORBA::Protocol::_tao_any_destructor (void *_tao_void_pointer)
+namespace RTCORBA
 {
-  Protocol *tmp = ACE_static_cast (Protocol*, _tao_void_pointer);
-  delete tmp;
+  ::CORBA::TypeCode_ptr _tc_Protocol =
+    &_tc_TAO_tc_RTCORBA_Protocol;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:292
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_Var_Var_T<
-      RTCORBA::Protocol
-    >;
-
-template class TAO_Var_Base_T<
-    RTCORBA::Protocol
-  >;
+// be/be_visitor_structure/structure_cs.cpp:66
 
-template class
-  TAO_Out_T<
-      RTCORBA::Protocol,
-      RTCORBA::Protocol_var
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_Var_Var_T< \
-      RTCORBA::Protocol \
-    >
-
-#pragma instantiate TAO_Var_Base_T<
-    RTCORBA::Protocol
-  >
-
-# pragma instantiate \
-  TAO_Out_T< \
-      RTCORBA::Protocol, \
-      RTCORBA::Protocol_var \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+void
+RTCORBA::Protocol::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  Protocol *_tao_tmp_pointer =
+    ACE_static_cast (Protocol *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:72
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CS_)
 #define _RTCORBA_PROTOCOLLIST_CS_
@@ -1533,186 +1404,140 @@ void RTCORBA::ProtocolList::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  ProtocolList * tmp =
-    ACE_static_cast (
-        ProtocolList *,
-        _tao_void_pointer
-      );
-  delete tmp;
+  ProtocolList * _tao_tmp_pointer =
+    ACE_static_cast (ProtocolList *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_VarSeq_Var_T<
-      RTCORBA::ProtocolList,
-      RTCORBA::Protocol
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      RTCORBA::ProtocolList,
-      RTCORBA::Protocol
-    >;
-
-template class
-  TAO_Seq_Out_T<
-      RTCORBA::ProtocolList,
-      RTCORBA::ProtocolList_var,
-      RTCORBA::Protocol
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_VarSeq_Var_T< \
-      ProtocolList, \
-      RTCORBA::Protocol \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      ProtocolList, \
-      RTCORBA::Protocol \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      ProtocolList, \
-      ProtocolList_var, \
-      RTCORBA::Protocol \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_PROTOCOL_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_PROTOCOL_CS_
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<
-    RTCORBA::Protocol
-  >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<
-    RTCORBA::Protocol
-  >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#endif /* end #if !defined */
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = ProtocolList
     CORBA::tk_sequence, // typecode kind
-  324, // encapsulation length
+  400, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    308, // encapsulation length
+    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 (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 (0x50726f74),
+      ACE_NTOHL (0x6f636f6c),
       ACE_NTOHL (0x0),  // name = Protocol
       3, // member count
             14,
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f747970), 
+      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 (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 (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 (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 (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 (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 (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
-            0xffffffff, // indirection
-      0xffffff84, // negative offset (-124)
+            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,
 
@@ -1726,98 +1551,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolList (
     sizeof (RTCORBA::ProtocolList)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ProtocolList,
-    &_tc_TAO_tc_RTCORBA_ProtocolList
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ProtocolList =
+    &_tc_TAO_tc_RTCORBA_ProtocolList;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::ServerProtocolPolicy::_tao_class_id = 0;
+// Traits specializations for RTCORBA::ServerProtocolPolicy.
 
 RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::tao_ServerProtocolPolicy_life::tao_duplicate (
-    ServerProtocolPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_duplicate (
+    RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
-  return ServerProtocolPolicy::_duplicate (p);
+  return RTCORBA::ServerProtocolPolicy::_duplicate (p);
 }
 
 void
-RTCORBA::tao_ServerProtocolPolicy_life::tao_release (
-    ServerProtocolPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_release (
+    RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::tao_ServerProtocolPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_nil (void)
 {
-  return ServerProtocolPolicy::_nil ();
+  return RTCORBA::ServerProtocolPolicy::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_ServerProtocolPolicy_life::tao_marshal (
-    ServerProtocolPolicy_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_marshal (
+    RTCORBA::ServerProtocolPolicy_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::tao_ServerProtocolPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_ServerProtocolPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  ServerProtocolPolicy **tmp =
-    ACE_static_cast (ServerProtocolPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::ServerProtocolPolicy,
-        RTCORBA::tao_ServerProtocolPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::ServerProtocolPolicy,
-        RTCORBA::tao_ServerProtocolPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::ServerProtocolPolicy, \
-        RTCORBA::tao_ServerProtocolPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::ServerProtocolPolicy, \
-        RTCORBA::tao_ServerProtocolPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_ServerProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 {}
@@ -1825,43 +1605,24 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServerProtocolPolicy *tmp = ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServerProtocolPolicy *_tao_tmp_pointer =
+    ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ServerProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ServerProtocolPolicy_ptr 
-RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ServerProtocolPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          ServerProtocolPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServerProtocolPolicy::_tao_class_id
-                )
-            )
-        );
+  ServerProtocolPolicy_ptr proxy =
+    dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
@@ -1871,53 +1632,41 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::ServerProtocolPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const
@@ -1932,30 +1681,30 @@ RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x53657276),
+  ACE_NTOHL (0x65725072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
   };
 
@@ -1967,98 +1716,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ServerProtocolPolicy (
     sizeof (RTCORBA::ServerProtocolPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServerProtocolPolicy,
-    &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy =
+    &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::ClientProtocolPolicy::_tao_class_id = 0;
+// Traits specializations for RTCORBA::ClientProtocolPolicy.
 
 RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::tao_ClientProtocolPolicy_life::tao_duplicate (
-    ClientProtocolPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_duplicate (
+    RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
-  return ClientProtocolPolicy::_duplicate (p);
+  return RTCORBA::ClientProtocolPolicy::_duplicate (p);
 }
 
 void
-RTCORBA::tao_ClientProtocolPolicy_life::tao_release (
-    ClientProtocolPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_release (
+    RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::tao_ClientProtocolPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_nil (void)
 {
-  return ClientProtocolPolicy::_nil ();
+  return RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_ClientProtocolPolicy_life::tao_marshal (
-    ClientProtocolPolicy_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_marshal (
+    RTCORBA::ClientProtocolPolicy_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::tao_ClientProtocolPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_ClientProtocolPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  ClientProtocolPolicy **tmp =
-    ACE_static_cast (ClientProtocolPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::ClientProtocolPolicy,
-        RTCORBA::tao_ClientProtocolPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::ClientProtocolPolicy,
-        RTCORBA::tao_ClientProtocolPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::ClientProtocolPolicy, \
-        RTCORBA::tao_ClientProtocolPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::ClientProtocolPolicy, \
-        RTCORBA::tao_ClientProtocolPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_ClientProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 {}
@@ -2066,43 +1770,24 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ClientProtocolPolicy *tmp = ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ClientProtocolPolicy *_tao_tmp_pointer =
+    ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ClientProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ClientProtocolPolicy_ptr 
-RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ClientProtocolPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          ClientProtocolPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ClientProtocolPolicy::_tao_class_id
-                )
-            )
-        );
+  ClientProtocolPolicy_ptr proxy =
+    dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
@@ -2112,53 +1797,41 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::ClientProtocolPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const
@@ -2173,30 +1846,30 @@ RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x436c6965),
+  ACE_NTOHL (0x6e745072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
   };
 
@@ -2208,98 +1881,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ClientProtocolPolicy (
     sizeof (RTCORBA::ClientProtocolPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ClientProtocolPolicy,
-    &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy =
+    &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::PrivateConnectionPolicy::_tao_class_id = 0;
+// Traits specializations for RTCORBA::PrivateConnectionPolicy.
 
 RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::tao_PrivateConnectionPolicy_life::tao_duplicate (
-    PrivateConnectionPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_duplicate (
+    RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
-  return PrivateConnectionPolicy::_duplicate (p);
+  return RTCORBA::PrivateConnectionPolicy::_duplicate (p);
 }
 
 void
-RTCORBA::tao_PrivateConnectionPolicy_life::tao_release (
-    PrivateConnectionPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_release (
+    RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::tao_PrivateConnectionPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_nil (void)
 {
-  return PrivateConnectionPolicy::_nil ();
+  return RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_PrivateConnectionPolicy_life::tao_marshal (
-    PrivateConnectionPolicy_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_marshal (
+    RTCORBA::PrivateConnectionPolicy_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::tao_PrivateConnectionPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_PrivateConnectionPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  PrivateConnectionPolicy **tmp =
-    ACE_static_cast (PrivateConnectionPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::PrivateConnectionPolicy,
-        RTCORBA::tao_PrivateConnectionPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::PrivateConnectionPolicy,
-        RTCORBA::tao_PrivateConnectionPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::PrivateConnectionPolicy, \
-        RTCORBA::tao_PrivateConnectionPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::PrivateConnectionPolicy, \
-        RTCORBA::tao_PrivateConnectionPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_PrivateConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 {}
@@ -2307,43 +1935,24 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PrivateConnectionPolicy *tmp = ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  PrivateConnectionPolicy *_tao_tmp_pointer =
+    ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PrivateConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::PrivateConnectionPolicy_ptr 
-RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return PrivateConnectionPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          PrivateConnectionPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &PrivateConnectionPolicy::_tao_class_id
-                )
-            )
-        );
+  PrivateConnectionPolicy_ptr proxy =
+    dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
@@ -2353,53 +1962,41 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::PrivateConnectionPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) const
@@ -2414,30 +2011,30 @@ RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x50726976),
+  ACE_NTOHL (0x61746543),
+  ACE_NTOHL (0x6f6e6e65),
+  ACE_NTOHL (0x6374696f),
+  ACE_NTOHL (0x6e506f6c),
   ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
   };
 
@@ -2449,98 +2046,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PrivateConnectionPolicy (
     sizeof (RTCORBA::PrivateConnectionPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PrivateConnectionPolicy,
-    &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy =
+    &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::TCPProtocolProperties::_tao_class_id = 0;
+// Traits specializations for RTCORBA::TCPProtocolProperties.
 
 RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::tao_TCPProtocolProperties_life::tao_duplicate (
-    TCPProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_duplicate (
+    RTCORBA::TCPProtocolProperties_ptr p
   )
 {
-  return TCPProtocolProperties::_duplicate (p);
+  return RTCORBA::TCPProtocolProperties::_duplicate (p);
 }
 
 void
-RTCORBA::tao_TCPProtocolProperties_life::tao_release (
-    TCPProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_release (
+    RTCORBA::TCPProtocolProperties_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::tao_TCPProtocolProperties_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_nil (void)
 {
-  return TCPProtocolProperties::_nil ();
+  return RTCORBA::TCPProtocolProperties::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_TCPProtocolProperties_life::tao_marshal (
-    TCPProtocolProperties_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_marshal (
+    RTCORBA::TCPProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::tao_TCPProtocolProperties_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_TCPProtocolProperties_cast::tao_upcast (
-    void *src
-  )
-{
-  TCPProtocolProperties **tmp =
-    ACE_static_cast (TCPProtocolProperties **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::TCPProtocolProperties,
-        RTCORBA::tao_TCPProtocolProperties_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::TCPProtocolProperties,
-        RTCORBA::tao_TCPProtocolProperties_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::TCPProtocolProperties, \
-        RTCORBA::tao_TCPProtocolProperties_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::TCPProtocolProperties, \
-        RTCORBA::tao_TCPProtocolProperties_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_TCPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 {}
@@ -2548,43 +2100,24 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
-  TCPProtocolProperties *tmp = ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer);
-  CORBA::release (tmp);
+  TCPProtocolProperties *_tao_tmp_pointer =
+    ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return TCPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::TCPProtocolProperties_ptr 
-RTCORBA::TCPProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return TCPProtocolProperties::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          TCPProtocolProperties_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &TCPProtocolProperties::_tao_class_id
-                )
-            )
-        );
+  TCPProtocolProperties_ptr proxy =
+    dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::TCPProtocolProperties_ptr
@@ -2594,53 +2127,41 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::TCPProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, TCPProtocolProperties)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                RTCORBA::ProtocolProperties_ptr,
-                this
-              )
-          );
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) const
@@ -2655,30 +2176,30 @@ RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x54435050),
+  ACE_NTOHL (0x726f746f),
+  ACE_NTOHL (0x636f6c50),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
   ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
   };
 
@@ -2690,98 +2211,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_TCPProtocolProperties (
     sizeof (RTCORBA::TCPProtocolProperties)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_TCPProtocolProperties,
-    &_tc_TAO_tc_RTCORBA_TCPProtocolProperties
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_TCPProtocolProperties;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::GIOPProtocolProperties::_tao_class_id = 0;
+// Traits specializations for RTCORBA::GIOPProtocolProperties.
 
 RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::tao_GIOPProtocolProperties_life::tao_duplicate (
-    GIOPProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_duplicate (
+    RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
-  return GIOPProtocolProperties::_duplicate (p);
+  return RTCORBA::GIOPProtocolProperties::_duplicate (p);
 }
 
 void
-RTCORBA::tao_GIOPProtocolProperties_life::tao_release (
-    GIOPProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_release (
+    RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::tao_GIOPProtocolProperties_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_nil (void)
 {
-  return GIOPProtocolProperties::_nil ();
+  return RTCORBA::GIOPProtocolProperties::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_GIOPProtocolProperties_life::tao_marshal (
-    GIOPProtocolProperties_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_marshal (
+    RTCORBA::GIOPProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::tao_GIOPProtocolProperties_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_GIOPProtocolProperties_cast::tao_upcast (
-    void *src
-  )
-{
-  GIOPProtocolProperties **tmp =
-    ACE_static_cast (GIOPProtocolProperties **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::GIOPProtocolProperties,
-        RTCORBA::tao_GIOPProtocolProperties_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::GIOPProtocolProperties,
-        RTCORBA::tao_GIOPProtocolProperties_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::GIOPProtocolProperties, \
-        RTCORBA::tao_GIOPProtocolProperties_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::GIOPProtocolProperties, \
-        RTCORBA::tao_GIOPProtocolProperties_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_GIOPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 {}
@@ -2789,43 +2265,24 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
-  GIOPProtocolProperties *tmp = ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer);
-  CORBA::release (tmp);
+  GIOPProtocolProperties *_tao_tmp_pointer =
+    ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return GIOPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::GIOPProtocolProperties_ptr 
-RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return GIOPProtocolProperties::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          GIOPProtocolProperties_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &GIOPProtocolProperties::_tao_class_id
-                )
-            )
-        );
+  GIOPProtocolProperties_ptr proxy =
+    dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
@@ -2835,53 +2292,41 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::GIOPProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, GIOPProtocolProperties)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                RTCORBA::ProtocolProperties_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) const
@@ -2896,30 +2341,30 @@ RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x47494f50),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
   };
 
@@ -2931,98 +2376,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_GIOPProtocolProperties (
     sizeof (RTCORBA::GIOPProtocolProperties)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_GIOPProtocolProperties,
-    &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::UnixDomainProtocolProperties::_tao_class_id = 0;
+// Traits specializations for RTCORBA::UnixDomainProtocolProperties.
 
 RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::tao_UnixDomainProtocolProperties_life::tao_duplicate (
-    UnixDomainProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_duplicate (
+    RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
-  return UnixDomainProtocolProperties::_duplicate (p);
+  return RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
 }
 
 void
-RTCORBA::tao_UnixDomainProtocolProperties_life::tao_release (
-    UnixDomainProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_release (
+    RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::tao_UnixDomainProtocolProperties_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_nil (void)
 {
-  return UnixDomainProtocolProperties::_nil ();
+  return RTCORBA::UnixDomainProtocolProperties::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_UnixDomainProtocolProperties_life::tao_marshal (
-    UnixDomainProtocolProperties_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_marshal (
+    RTCORBA::UnixDomainProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_upcast (
-    void *src
-  )
-{
-  UnixDomainProtocolProperties **tmp =
-    ACE_static_cast (UnixDomainProtocolProperties **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::UnixDomainProtocolProperties,
-        RTCORBA::tao_UnixDomainProtocolProperties_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::UnixDomainProtocolProperties,
-        RTCORBA::tao_UnixDomainProtocolProperties_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::UnixDomainProtocolProperties, \
-        RTCORBA::tao_UnixDomainProtocolProperties_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::UnixDomainProtocolProperties, \
-        RTCORBA::tao_UnixDomainProtocolProperties_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_UnixDomainProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 {}
@@ -3030,43 +2430,24 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UnixDomainProtocolProperties *tmp = ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer);
-  CORBA::release (tmp);
+  UnixDomainProtocolProperties *_tao_tmp_pointer =
+    ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return UnixDomainProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::UnixDomainProtocolProperties_ptr 
-RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return UnixDomainProtocolProperties::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          UnixDomainProtocolProperties_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &UnixDomainProtocolProperties::_tao_class_id
-                )
-            )
-        );
+  UnixDomainProtocolProperties_ptr proxy =
+    dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
@@ -3076,53 +2457,41 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::UnixDomainProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, UnixDomainProtocolProperties)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                RTCORBA::ProtocolProperties_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (void) const
@@ -3137,34 +2506,34 @@ RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x556e6978),
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e5072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5072),
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x74696573),
   ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
   };
 
@@ -3176,98 +2545,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties (
     sizeof (RTCORBA::UnixDomainProtocolProperties)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_UnixDomainProtocolProperties,
-    &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::SharedMemoryProtocolProperties::_tao_class_id = 0;
+// Traits specializations for RTCORBA::SharedMemoryProtocolProperties.
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_duplicate (
-    SharedMemoryProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_duplicate (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
-  return SharedMemoryProtocolProperties::_duplicate (p);
+  return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
 }
 
 void
-RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_release (
-    SharedMemoryProtocolProperties_ptr p
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_release (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_nil (void)
 {
-  return SharedMemoryProtocolProperties::_nil ();
+  return RTCORBA::SharedMemoryProtocolProperties::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_marshal (
-    SharedMemoryProtocolProperties_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_marshal (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_upcast (
-    void *src
-  )
-{
-  SharedMemoryProtocolProperties **tmp =
-    ACE_static_cast (SharedMemoryProtocolProperties **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::SharedMemoryProtocolProperties,
-        RTCORBA::tao_SharedMemoryProtocolProperties_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::SharedMemoryProtocolProperties,
-        RTCORBA::tao_SharedMemoryProtocolProperties_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::SharedMemoryProtocolProperties, \
-        RTCORBA::tao_SharedMemoryProtocolProperties_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::SharedMemoryProtocolProperties, \
-        RTCORBA::tao_SharedMemoryProtocolProperties_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_SharedMemoryProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 {}
@@ -3275,43 +2599,24 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
-  SharedMemoryProtocolProperties *tmp = ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer);
-  CORBA::release (tmp);
+  SharedMemoryProtocolProperties *_tao_tmp_pointer =
+    ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return SharedMemoryProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::SharedMemoryProtocolProperties_ptr 
-RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return SharedMemoryProtocolProperties::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          SharedMemoryProtocolProperties_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &SharedMemoryProtocolProperties::_tao_class_id
-                )
-            )
-        );
+  SharedMemoryProtocolProperties_ptr proxy =
+    dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
@@ -3321,53 +2626,41 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::SharedMemoryProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, SharedMemoryProtocolProperties)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                RTCORBA::ProtocolProperties_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (void) const
@@ -3382,34 +2675,34 @@ RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x53686172),
+  ACE_NTOHL (0x65644d65),
+  ACE_NTOHL (0x6d6f7279),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
   };
 
@@ -3421,36 +2714,33 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties (
     sizeof (RTCORBA::SharedMemoryProtocolProperties)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_SharedMemoryProtocolProperties,
-    &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
   ACE_NTOHL (0x0),  // name = PriorityBand
   2, // member count
     4,
@@ -3459,27 +2749,45 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
   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 (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 (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   5,
-  ACE_NTOHL (0x68696768), 
+  ACE_NTOHL (0x68696768),
   ACE_NTOHL (0x0),  // name = high
-    0xffffffff, // indirection
-  0xffffffa8, // negative offset (-88)
+    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 (
@@ -3490,53 +2798,27 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (
     sizeof (RTCORBA::PriorityBand)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PriorityBand,
-    &_tc_TAO_tc_RTCORBA_PriorityBand
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer)
+namespace RTCORBA
 {
-  PriorityBand *tmp = ACE_static_cast (PriorityBand*, _tao_void_pointer);
-  delete tmp;
+  ::CORBA::TypeCode_ptr _tc_PriorityBand =
+    &_tc_TAO_tc_RTCORBA_PriorityBand;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:292
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_Fixed_Var_T<
-      RTCORBA::PriorityBand
-    >;
-
-template class TAO_Var_Base_T<
-    RTCORBA::PriorityBand
-  >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_Fixed_Var_T< \
-      RTCORBA::PriorityBand \
-    >
-
-#pragma instantiate TAO_Var_Base_T<
-    RTCORBA::PriorityBand
-  >
+// be/be_visitor_structure/structure_cs.cpp:66
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+void
+RTCORBA::PriorityBand::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  PriorityBand *_tao_tmp_pointer =
+    ACE_static_cast (PriorityBand *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:72
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CS_)
 #define _RTCORBA_PRIORITYBANDS_CS_
@@ -3581,122 +2863,56 @@ void RTCORBA::PriorityBands::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  PriorityBands * tmp =
-    ACE_static_cast (
-        PriorityBands *,
-        _tao_void_pointer
-      );
-  delete tmp;
+  PriorityBands * _tao_tmp_pointer =
+    ACE_static_cast (PriorityBands *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_FixedSeq_Var_T<
-      RTCORBA::PriorityBands,
-      RTCORBA::PriorityBand
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      RTCORBA::PriorityBands,
-      RTCORBA::PriorityBand
-    >;
-
-template class
-  TAO_Seq_Out_T<
-      RTCORBA::PriorityBands,
-      RTCORBA::PriorityBands_var,
-      RTCORBA::PriorityBand
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_FixedSeq_Var_T< \
-      PriorityBands, \
-      RTCORBA::PriorityBand \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      PriorityBands, \
-      RTCORBA::PriorityBand \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      PriorityBands, \
-      PriorityBands_var, \
-      RTCORBA::PriorityBand \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_PRIORITYBAND_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_PRIORITYBAND_CS_
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<
-    RTCORBA::PriorityBand
-  >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<
-    RTCORBA::PriorityBand
-  >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#endif /* end #if !defined */
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
   ACE_NTOHL (0x73000000),  // name = PriorityBands
     CORBA::tk_sequence, // typecode kind
-  188, // encapsulation length
+  252, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    172, // encapsulation length
+    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 (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 (0x5072696f),
+      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x42616e64),
       ACE_NTOHL (0x0),  // name = PriorityBand
       2, // member count
             4,
@@ -3705,27 +2921,45 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
       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 (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 (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       5,
-      ACE_NTOHL (0x68696768), 
+      ACE_NTOHL (0x68696768),
       ACE_NTOHL (0x0),  // name = high
-            0xffffffff, // indirection
-      0xffffffa8, // negative offset (-88)
+            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,
 
@@ -3739,98 +2973,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (
     sizeof (RTCORBA::PriorityBands)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PriorityBands,
-    &_tc_TAO_tc_RTCORBA_PriorityBands
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityBands =
+    &_tc_TAO_tc_RTCORBA_PriorityBands;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::PriorityBandedConnectionPolicy::_tao_class_id = 0;
+// Traits specializations for RTCORBA::PriorityBandedConnectionPolicy.
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_duplicate (
-    PriorityBandedConnectionPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_duplicate (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
-  return PriorityBandedConnectionPolicy::_duplicate (p);
+  return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
 }
 
 void
-RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_release (
-    PriorityBandedConnectionPolicy_ptr p
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_release (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_nil (void)
 {
-  return PriorityBandedConnectionPolicy::_nil ();
+  return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_marshal (
-    PriorityBandedConnectionPolicy_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_marshal (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  PriorityBandedConnectionPolicy **tmp =
-    ACE_static_cast (PriorityBandedConnectionPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::PriorityBandedConnectionPolicy,
-        RTCORBA::tao_PriorityBandedConnectionPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::PriorityBandedConnectionPolicy,
-        RTCORBA::tao_PriorityBandedConnectionPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::PriorityBandedConnectionPolicy, \
-        RTCORBA::tao_PriorityBandedConnectionPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::PriorityBandedConnectionPolicy, \
-        RTCORBA::tao_PriorityBandedConnectionPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_PriorityBandedConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 {}
@@ -3838,43 +3027,24 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PriorityBandedConnectionPolicy *tmp = ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  PriorityBandedConnectionPolicy *_tao_tmp_pointer =
+    ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr 
-RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return PriorityBandedConnectionPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          PriorityBandedConnectionPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &PriorityBandedConnectionPolicy::_tao_class_id
-                )
-            )
-        );
+  PriorityBandedConnectionPolicy_ptr proxy =
+    dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
@@ -3884,53 +3054,41 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::PriorityBandedConnectionPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (void) const
@@ -3945,34 +3103,34 @@ RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6e6e6563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
   };
 
@@ -3984,98 +3142,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy (
     sizeof (RTCORBA::PriorityBandedConnectionPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PriorityBandedConnectionPolicy,
-    &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy =
+    &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::Current::_tao_class_id = 0;
+// Traits specializations for RTCORBA::Current.
 
 RTCORBA::Current_ptr
-RTCORBA::tao_Current_life::tao_duplicate (
-    Current_ptr p
+TAO::Objref_Traits<RTCORBA::Current>::tao_duplicate (
+    RTCORBA::Current_ptr p
   )
 {
-  return Current::_duplicate (p);
+  return RTCORBA::Current::_duplicate (p);
 }
 
 void
-RTCORBA::tao_Current_life::tao_release (
-    Current_ptr p
+TAO::Objref_Traits<RTCORBA::Current>::tao_release (
+    RTCORBA::Current_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::Current_ptr
-RTCORBA::tao_Current_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::Current>::tao_nil (void)
 {
-  return Current::_nil ();
+  return RTCORBA::Current::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_Current_life::tao_marshal (
-    Current_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::Current>::tao_marshal (
+    RTCORBA::Current_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::Current_ptr
-RTCORBA::tao_Current_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_Current_cast::tao_upcast (
-    void *src
-  )
-{
-  Current **tmp =
-    ACE_static_cast (Current **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::Current,
-        RTCORBA::tao_Current_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::Current,
-        RTCORBA::tao_Current_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::Current, \
-        RTCORBA::tao_Current_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::Current, \
-        RTCORBA::tao_Current_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::Current::Current (void)
 {}
@@ -4083,43 +3196,24 @@ RTCORBA::Current::Current (void)
 RTCORBA::Current::~Current (void)
 {}
 
-void 
+void
 RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
-  CORBA::release (tmp);
+  Current *_tao_tmp_pointer =
+    ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::Current_ptr
 RTCORBA::Current::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::Current_ptr 
-RTCORBA::Current::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return Current::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          Current_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Current::_tao_class_id
-                )
-            )
-        );
+  Current_ptr proxy =
+    dynamic_cast<Current_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::Current_ptr
@@ -4129,53 +3223,41 @@ RTCORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::Current::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::Current::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, Current)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Current::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Current_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::Current::_interface_repository_id (void) const
@@ -4190,22 +3272,22 @@ RTCORBA::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -4217,98 +3299,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Current (
     sizeof (RTCORBA::Current)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Current,
-    &_tc_TAO_tc_RTCORBA_Current
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_RTCORBA_Current;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::Mutex::_tao_class_id = 0;
+// Traits specializations for RTCORBA::Mutex.
 
 RTCORBA::Mutex_ptr
-RTCORBA::tao_Mutex_life::tao_duplicate (
-    Mutex_ptr p
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_duplicate (
+    RTCORBA::Mutex_ptr p
   )
 {
-  return Mutex::_duplicate (p);
+  return RTCORBA::Mutex::_duplicate (p);
 }
 
 void
-RTCORBA::tao_Mutex_life::tao_release (
-    Mutex_ptr p
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_release (
+    RTCORBA::Mutex_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::Mutex_ptr
-RTCORBA::tao_Mutex_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_nil (void)
 {
-  return Mutex::_nil ();
+  return RTCORBA::Mutex::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_Mutex_life::tao_marshal (
-    Mutex_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_marshal (
+    RTCORBA::Mutex_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::Mutex_ptr
-RTCORBA::tao_Mutex_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Mutex::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_Mutex_cast::tao_upcast (
-    void *src
-  )
-{
-  Mutex **tmp =
-    ACE_static_cast (Mutex **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::Mutex,
-        RTCORBA::tao_Mutex_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::Mutex,
-        RTCORBA::tao_Mutex_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::Mutex, \
-        RTCORBA::tao_Mutex_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::Mutex, \
-        RTCORBA::tao_Mutex_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_Mutex_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTCORBA::Mutex::Mutex (void)
 {}
@@ -4316,43 +3353,24 @@ RTCORBA::Mutex::Mutex (void)
 RTCORBA::Mutex::~Mutex (void)
 {}
 
-void 
+void
 RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Mutex *tmp = ACE_static_cast (Mutex *, _tao_void_pointer);
-  CORBA::release (tmp);
+  Mutex *_tao_tmp_pointer =
+    ACE_static_cast (Mutex *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::Mutex_ptr
 RTCORBA::Mutex::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Mutex::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::Mutex_ptr 
-RTCORBA::Mutex::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return Mutex::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          Mutex_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Mutex::_tao_class_id
-                )
-            )
-        );
+  Mutex_ptr proxy =
+    dynamic_cast<Mutex_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTCORBA::Mutex_ptr
@@ -4362,39 +3380,37 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
-void *RTCORBA::Mutex::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTCORBA::Mutex::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, Mutex)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/Mutex:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTCORBA::Mutex::_interface_repository_id (void) const
@@ -4409,22 +3425,22 @@ RTCORBA::Mutex::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x4d757465),
   ACE_NTOHL (0x78000000),  // name = Mutex
   };
 
@@ -4436,199 +3452,56 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Mutex (
     sizeof (RTCORBA::Mutex)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Mutex,
-    &_tc_TAO_tc_RTCORBA_Mutex
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Mutex =
+    &_tc_TAO_tc_RTCORBA_Mutex;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTCORBA::RTORB::_tao_class_id = 0;
+// Traits specializations for RTCORBA::RTORB.
 
 RTCORBA::RTORB_ptr
-RTCORBA::tao_RTORB_life::tao_duplicate (
-    RTORB_ptr p
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_duplicate (
+    RTCORBA::RTORB_ptr p
   )
 {
-  return RTORB::_duplicate (p);
+  return RTCORBA::RTORB::_duplicate (p);
 }
 
 void
-RTCORBA::tao_RTORB_life::tao_release (
-    RTORB_ptr p
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_release (
+    RTCORBA::RTORB_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTCORBA::RTORB_ptr
-RTCORBA::tao_RTORB_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_nil (void)
 {
-  return RTORB::_nil ();
+  return RTCORBA::RTORB::_nil ();
 }
 
 CORBA::Boolean
-RTCORBA::tao_RTORB_life::tao_marshal (
-    RTORB_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_marshal (
+    RTCORBA::RTORB_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTCORBA::RTORB_ptr
-RTCORBA::tao_RTORB_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return RTORB::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::tao_RTORB_cast::tao_upcast (
-    void *src
-  )
-{
-  RTORB **tmp =
-    ACE_static_cast (RTORB **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTCORBA::RTORB,
-        RTCORBA::tao_RTORB_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTCORBA::RTORB,
-        RTCORBA::tao_RTORB_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTCORBA::RTORB, \
-        RTCORBA::tao_RTORB_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTCORBA::RTORB, \
-        RTCORBA::tao_RTORB_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:239
-
-RTCORBA::RTORB::RTORB (void)
-{}
-
-RTCORBA::RTORB::~RTORB (void)
-{}
-
-void 
-RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RTORB *tmp = ACE_static_cast (RTORB *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
-RTCORBA::RTORB_ptr
-RTCORBA::RTORB::_narrow (
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*RTCORBA__TAO_RTORB_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return RTORB::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::RTORB_ptr 
-RTCORBA::RTORB::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return RTORB::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          RTORB_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &RTORB::_tao_class_id
-                )
-            )
-        );
-}
-
-RTCORBA::RTORB_ptr
-RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void *RTCORBA::RTORB::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTCORBA, RTORB)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
+  ) = 0;
 
-const char* RTCORBA::RTORB::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/RTORB:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::RTORB::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from
+// be/be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
   : CORBA::UserException (
@@ -4659,8 +3532,9 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound
 
 void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
-  MutexNotFound *tmp = ACE_static_cast (MutexNotFound*, _tao_void_pointer);
-  delete tmp;
+  MutexNotFound *_tao_tmp_pointer =
+    ACE_static_cast (MutexNotFound*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 RTCORBA::RTORB::MutexNotFound *
@@ -4723,27 +3597,27 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x4d757465),
+  ACE_NTOHL (0x784e6f74),
+  ACE_NTOHL (0x466f756e),
   ACE_NTOHL (0x64000000),  // name = MutexNotFound
   0, // member count
   };
@@ -4759,8 +3633,8 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound =
   &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from
+// be/be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
   : CORBA::UserException (
@@ -4791,8 +3665,9 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer)
 {
-  InvalidThreadpool *tmp = ACE_static_cast (InvalidThreadpool*, _tao_void_pointer);
-  delete tmp;
+  InvalidThreadpool *_tao_tmp_pointer =
+    ACE_static_cast (InvalidThreadpool*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 RTCORBA::RTORB::InvalidThreadpool *
@@ -4855,29 +3730,29 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x496e7661),
+  ACE_NTOHL (0x6c696454),
+  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x64706f6f),
   ACE_NTOHL (0x6c000000),  // name = InvalidThreadpool
   0, // member count
   };
@@ -4893,23 +3768,100 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool (
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_InvalidThreadpool =
   &_tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool;
 
+RTCORBA::RTORB::RTORB (void)
+{}
+
+RTCORBA::RTORB::~RTORB (void)
+{}
+
+void
+RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RTORB *_tao_tmp_pointer =
+    ACE_static_cast (RTORB *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+RTCORBA::RTORB_ptr
+RTCORBA::RTORB::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  RTORB_ptr proxy =
+    dynamic_cast<RTORB_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
+}
+
+RTCORBA::RTORB_ptr
+RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+CORBA::Boolean
+RTCORBA::RTORB::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/RTORB:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* RTCORBA::RTORB::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/RTCORBA/RTORB:1.0";
+}
+
+CORBA::Boolean
+RTCORBA::RTORB::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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 (0x52544f52),
   ACE_NTOHL (0x42000000),  // name = RTORB
   };
 
@@ -4921,17 +3873,14 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB (
     sizeof (RTCORBA::RTORB)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_RTORB,
-    &_tc_TAO_tc_RTCORBA_RTORB
-  )
-TAO_NAMESPACE_END
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_RTORB =
+    &_tc_TAO_tc_RTCORBA_RTORB;
+}
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -4988,15 +3937,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5053,15 +3995,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+// be/be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -5084,19 +4019,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
         _tao_any,
         RTCORBA::_tc_PriorityModel,
-        _tao_elem 
+        _tao_elem
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5140,15 +4068,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5192,15 +4137,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5244,15 +4206,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::ProtocolProperties>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::ProtocolProperties>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5309,15 +4288,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<RTCORBA::Protocol>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::Protocol>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5374,15 +4346,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5426,15 +4391,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5478,15 +4460,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5530,15 +4529,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5582,15 +4598,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5634,15 +4667,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5686,15 +4736,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5738,15 +4805,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5803,15 +4887,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5868,15 +4945,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5920,15 +4990,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5972,15 +5059,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::Current>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::Current>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6024,15 +5128,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6076,15 +5197,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTCORBA::RTORB>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTCORBA::RTORB>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:80
+// be/be_visitor_sequence/cdr_op_cs.cpp:95
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
@@ -6095,20 +5233,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -6118,7 +5256,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -6128,35 +5266,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:80
+// be/be_visitor_sequence/cdr_op_cs.cpp:95
 
 #if !defined _TAO_CDR_OP_RTCORBA_ProtocolList_CPP_
 #define _TAO_CDR_OP_RTCORBA_ProtocolList_CPP_
@@ -6167,20 +5305,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -6195,7 +5333,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ProtocolList_CPP_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:80
+// be/be_visitor_sequence/cdr_op_cs.cpp:95
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
@@ -6206,20 +5344,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -6229,7 +5367,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -6239,31 +5377,1374 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
 
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
+// TAO_IDL - Generated from
+// be/be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::SetOverrideType
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::PolicyError
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::InvalidPolicies
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::TCKind
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::exception_type
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::ParameterMode
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::Codec::InvalidTypeForEncoding
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::Codec::FormatMismatch
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::Codec::TypeMismatch
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::CodecFactory::UnknownEncoding
+      >;
+
+  template class
+    TAO_Fixed_Var_T<
+        RTCORBA::ThreadpoolLane
+      >;
+
+  template class
+    TAO_Var_Base_T<
+        RTCORBA::ThreadpoolLane
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::ThreadpoolLane
+      >;
+
+#if !defined (_RTCORBA_THREADPOOLLANES__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_THREADPOOLLANES__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::ThreadpoolLanes>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        RTCORBA::ThreadpoolLanes,
+        RTCORBA::ThreadpoolLanes_var,
+        RTCORBA::ThreadpoolLanes_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_FixedSeq_Var_T<
+        RTCORBA::ThreadpoolLanes,
+        RTCORBA::ThreadpoolLane
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        RTCORBA::ThreadpoolLanes,
+        RTCORBA::ThreadpoolLane
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        RTCORBA::ThreadpoolLanes,
+        RTCORBA::ThreadpoolLanes_var,
+        RTCORBA::ThreadpoolLane
+      >;
+
+#if !defined (_RTCORBA_THREADPOOLLANES_CS_)
+#define _RTCORBA_THREADPOOLLANES_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        RTCORBA::ThreadpoolLane
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::ThreadpoolLanes
+      >;
+
+#if !defined (_RTCORBA_PRIORITYMODEL__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYMODEL__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::PriorityModel>;
+
+  template class TAO::Basic_Arg_Traits_T<RTCORBA::PriorityModel>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        RTCORBA::PriorityModel
+      >;
+
+#if !defined (_RTCORBA_PRIORITYMODELPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYMODELPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::PriorityModelPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::PriorityModelPolicy_ptr,
+        RTCORBA::PriorityModelPolicy_var,
+        RTCORBA::PriorityModelPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::PriorityModelPolicy,
+        TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::PriorityModelPolicy,
+        TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::PriorityModelPolicy
+      >;
+
+#if !defined (_RTCORBA_THREADPOOLPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_THREADPOOLPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::ThreadpoolPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::ThreadpoolPolicy_ptr,
+        RTCORBA::ThreadpoolPolicy_var,
+        RTCORBA::ThreadpoolPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ThreadpoolPolicy,
+        TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ThreadpoolPolicy,
+        TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ThreadpoolPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::ProtocolProperties>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::ProtocolProperties>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ProtocolProperties
+      >;
+
+  template class
+    TAO_Var_Var_T<
+        RTCORBA::Protocol
+      >;
+
+  template class
+    TAO_Var_Base_T<
+        RTCORBA::Protocol
+      >;
+
+  template class
+    TAO_Out_T<
+        RTCORBA::Protocol,
+        RTCORBA::Protocol_var
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::Protocol
+      >;
+
+#if !defined (_RTCORBA_PROTOCOLLIST__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PROTOCOLLIST__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::ProtocolList>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        RTCORBA::ProtocolList,
+        RTCORBA::ProtocolList_var,
+        RTCORBA::ProtocolList_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_VarSeq_Var_T<
+        RTCORBA::ProtocolList,
+        RTCORBA::Protocol
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        RTCORBA::ProtocolList,
+        RTCORBA::Protocol
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        RTCORBA::ProtocolList,
+        RTCORBA::ProtocolList_var,
+        RTCORBA::Protocol
+      >;
+
+#if !defined (_RTCORBA_PROTOCOLLIST_CS_)
+#define _RTCORBA_PROTOCOLLIST_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        RTCORBA::Protocol
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::ProtocolList
+      >;
+
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::ServerProtocolPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::ServerProtocolPolicy_ptr,
+        RTCORBA::ServerProtocolPolicy_var,
+        RTCORBA::ServerProtocolPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ServerProtocolPolicy,
+        TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ServerProtocolPolicy,
+        TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ServerProtocolPolicy
+      >;
+
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::ClientProtocolPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::ClientProtocolPolicy_ptr,
+        RTCORBA::ClientProtocolPolicy_var,
+        RTCORBA::ClientProtocolPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ClientProtocolPolicy,
+        TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ClientProtocolPolicy,
+        TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ClientProtocolPolicy
+      >;
+
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::PrivateConnectionPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::PrivateConnectionPolicy_ptr,
+        RTCORBA::PrivateConnectionPolicy_var,
+        RTCORBA::PrivateConnectionPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::PrivateConnectionPolicy,
+        TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::PrivateConnectionPolicy,
+        TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::PrivateConnectionPolicy
+      >;
+
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::TCPProtocolProperties>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::TCPProtocolProperties_ptr,
+        RTCORBA::TCPProtocolProperties_var,
+        RTCORBA::TCPProtocolProperties_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::TCPProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::TCPProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::TCPProtocolProperties
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::GIOPProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::GIOPProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::GIOPProtocolProperties
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::UnixDomainProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::UnixDomainProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::UnixDomainProtocolProperties
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::SharedMemoryProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::SharedMemoryProtocolProperties,
+        TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::SharedMemoryProtocolProperties
+      >;
+
+  template class
+    TAO_Fixed_Var_T<
+        RTCORBA::PriorityBand
+      >;
+
+  template class
+    TAO_Var_Base_T<
+        RTCORBA::PriorityBand
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::PriorityBand
+      >;
+
+#if !defined (_RTCORBA_PRIORITYBANDS__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYBANDS__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::PriorityBands>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        RTCORBA::PriorityBands,
+        RTCORBA::PriorityBands_var,
+        RTCORBA::PriorityBands_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_FixedSeq_Var_T<
+        RTCORBA::PriorityBands,
+        RTCORBA::PriorityBand
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        RTCORBA::PriorityBands,
+        RTCORBA::PriorityBand
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        RTCORBA::PriorityBands,
+        RTCORBA::PriorityBands_var,
+        RTCORBA::PriorityBand
+      >;
+
+#if !defined (_RTCORBA_PRIORITYBANDS_CS_)
+#define _RTCORBA_PRIORITYBANDS_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        RTCORBA::PriorityBand
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::PriorityBands
+      >;
+
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::PriorityBandedConnectionPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::PriorityBandedConnectionPolicy_ptr,
+        RTCORBA::PriorityBandedConnectionPolicy_var,
+        RTCORBA::PriorityBandedConnectionPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::PriorityBandedConnectionPolicy,
+        TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::PriorityBandedConnectionPolicy,
+        TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::PriorityBandedConnectionPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::Current,
+        TAO::Objref_Traits<RTCORBA::Current>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::Current,
+        TAO::Objref_Traits<RTCORBA::Current>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::Current
+      >;
+
+#if !defined (_RTCORBA_MUTEX__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_MUTEX__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTCORBA::Mutex>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTCORBA::Mutex_ptr,
+        RTCORBA::Mutex_var,
+        RTCORBA::Mutex_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::Mutex,
+        TAO::Objref_Traits<RTCORBA::Mutex>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::Mutex,
+        TAO::Objref_Traits<RTCORBA::Mutex>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::Mutex
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::Mutex_ptr,
+        RTCORBA::Mutex_var
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        RTCORBA::Mutex_ptr
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::RTORB::MutexNotFound
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::TCPProtocolProperties_ptr,
+        RTCORBA::TCPProtocolProperties_var
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::RTORB::InvalidThreadpool
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        RTCORBA::ThreadpoolLanes
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::PriorityModelPolicy_ptr,
+        RTCORBA::PriorityModelPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        RTCORBA::PriorityModel
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::ThreadpoolPolicy_ptr,
+        RTCORBA::ThreadpoolPolicy_var
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::PriorityBandedConnectionPolicy_ptr,
+        RTCORBA::PriorityBandedConnectionPolicy_var
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        RTCORBA::PriorityBands
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::ServerProtocolPolicy_ptr,
+        RTCORBA::ServerProtocolPolicy_var
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        RTCORBA::ProtocolList
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::ClientProtocolPolicy_ptr,
+        RTCORBA::ClientProtocolPolicy_var
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTCORBA::PrivateConnectionPolicy_ptr,
+        RTCORBA::PrivateConnectionPolicy_var
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::RTORB,
+        TAO::Objref_Traits<RTCORBA::RTORB>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::RTORB,
+        TAO::Objref_Traits<RTCORBA::RTORB>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::RTORB
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::SetOverrideType \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::PolicyError \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::InvalidPolicies \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::TCKind \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::exception_type \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::ParameterMode \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::Codec::InvalidTypeForEncoding \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::Codec::FormatMismatch \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::Codec::TypeMismatch \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::CodecFactory::UnknownEncoding \
+      >
+
+# pragma instantiate \
+    TAO_Fixed_Var_T< \
+        RTCORBA::ThreadpoolLane \
+      >
+
+# pragma instantiate \
+    TAO_Var_Base_T< \
+        RTCORBA::ThreadpoolLane \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::ThreadpoolLane \
+      >
+
+#if !defined (_RTCORBA_THREADPOOLLANES__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_THREADPOOLLANES__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::ThreadpoolLanes>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        RTCORBA::ThreadpoolLanes, \
+        RTCORBA::ThreadpoolLanes_var, \
+        RTCORBA::ThreadpoolLanes_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_FixedSeq_Var_T< \
+        RTCORBA::ThreadpoolLanes, \
+        RTCORBA::ThreadpoolLane \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        RTCORBA::ThreadpoolLanes, \
+        RTCORBA::ThreadpoolLane \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        RTCORBA::ThreadpoolLanes, \
+        RTCORBA::ThreadpoolLanes_var, \
+        RTCORBA::ThreadpoolLane \
+      >
+
+#if !defined (_RTCORBA_THREADPOOLLANES_CS_)
+#define _RTCORBA_THREADPOOLLANES_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        RTCORBA::ThreadpoolLane \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::ThreadpoolLanes \
+      >
+
+#if !defined (_RTCORBA_PRIORITYMODEL__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYMODEL__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::PriorityModel>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<RTCORBA::PriorityModel>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        RTCORBA::PriorityModel \
+      >
+
+#if !defined (_RTCORBA_PRIORITYMODELPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYMODELPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::PriorityModelPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::PriorityModelPolicy_ptr, \
+        RTCORBA::PriorityModelPolicy_var, \
+        RTCORBA::PriorityModelPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::PriorityModelPolicy, \
+        TAO::Objref_Traits<RTCORBA::PriorityModelPolicy> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::PriorityModelPolicy, \
+        TAO::Objref_Traits<RTCORBA::PriorityModelPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::PriorityModelPolicy \
+      >
+
+#if !defined (_RTCORBA_THREADPOOLPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_THREADPOOLPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::ThreadpoolPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::ThreadpoolPolicy_ptr, \
+        RTCORBA::ThreadpoolPolicy_var, \
+        RTCORBA::ThreadpoolPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ThreadpoolPolicy, \
+        TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ThreadpoolPolicy, \
+        TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ThreadpoolPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::ProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::ProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Var_Var_T< \
+        RTCORBA::Protocol \
+      >
+
+# pragma instantiate \
+    TAO_Var_Base_T< \
+        RTCORBA::Protocol \
+      >
+
+# pragma instantiate \
+    TAO_Out_T< \
+        RTCORBA::Protocol, \
+        RTCORBA::Protocol_var \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::Protocol \
+      >
+
+#if !defined (_RTCORBA_PROTOCOLLIST__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PROTOCOLLIST__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::ProtocolList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        RTCORBA::ProtocolList, \
+        RTCORBA::ProtocolList_var, \
+        RTCORBA::ProtocolList_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        RTCORBA::ProtocolList, \
+        RTCORBA::Protocol \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        RTCORBA::ProtocolList, \
+        RTCORBA::Protocol \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        RTCORBA::ProtocolList, \
+        RTCORBA::ProtocolList_var, \
+        RTCORBA::Protocol \
+      >
+
+#if !defined (_RTCORBA_PROTOCOLLIST_CS_)
+#define _RTCORBA_PROTOCOLLIST_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        RTCORBA::Protocol \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::ProtocolList \
+      >
+
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::ServerProtocolPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::ServerProtocolPolicy_ptr, \
+        RTCORBA::ServerProtocolPolicy_var, \
+        RTCORBA::ServerProtocolPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ServerProtocolPolicy, \
+        TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ServerProtocolPolicy, \
+        TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ServerProtocolPolicy \
+      >
+
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::ClientProtocolPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::ClientProtocolPolicy_ptr, \
+        RTCORBA::ClientProtocolPolicy_var, \
+        RTCORBA::ClientProtocolPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ClientProtocolPolicy, \
+        TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ClientProtocolPolicy, \
+        TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ClientProtocolPolicy \
+      >
+
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::PrivateConnectionPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::PrivateConnectionPolicy_ptr, \
+        RTCORBA::PrivateConnectionPolicy_var, \
+        RTCORBA::PrivateConnectionPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::PrivateConnectionPolicy, \
+        TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::PrivateConnectionPolicy, \
+        TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::PrivateConnectionPolicy \
+      >
+
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::TCPProtocolProperties>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::TCPProtocolProperties_ptr, \
+        RTCORBA::TCPProtocolProperties_var, \
+        RTCORBA::TCPProtocolProperties_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::TCPProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::TCPProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::TCPProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::TCPProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::TCPProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::GIOPProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::GIOPProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::GIOPProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::UnixDomainProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::UnixDomainProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::UnixDomainProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::SharedMemoryProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::SharedMemoryProtocolProperties, \
+        TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::SharedMemoryProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Fixed_Var_T< \
+        RTCORBA::PriorityBand \
+      >
+
+# pragma instantiate \
+    TAO_Var_Base_T< \
+        RTCORBA::PriorityBand \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::PriorityBand \
+      >
+
+#if !defined (_RTCORBA_PRIORITYBANDS__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYBANDS__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::PriorityBands>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        RTCORBA::PriorityBands, \
+        RTCORBA::PriorityBands_var, \
+        RTCORBA::PriorityBands_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_FixedSeq_Var_T< \
+        RTCORBA::PriorityBands, \
+        RTCORBA::PriorityBand \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        RTCORBA::PriorityBands, \
+        RTCORBA::PriorityBand \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        RTCORBA::PriorityBands, \
+        RTCORBA::PriorityBands_var, \
+        RTCORBA::PriorityBand \
+      >
+
+#if !defined (_RTCORBA_PRIORITYBANDS_CS_)
+#define _RTCORBA_PRIORITYBANDS_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        RTCORBA::PriorityBand \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::PriorityBands \
+      >
+
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::PriorityBandedConnectionPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::PriorityBandedConnectionPolicy_ptr, \
+        RTCORBA::PriorityBandedConnectionPolicy_var, \
+        RTCORBA::PriorityBandedConnectionPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::PriorityBandedConnectionPolicy, \
+        TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::PriorityBandedConnectionPolicy, \
+        TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::PriorityBandedConnectionPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::Current, \
+        TAO::Objref_Traits<RTCORBA::Current> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::Current, \
+        TAO::Objref_Traits<RTCORBA::Current> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::Current \
+      >
+
+#if !defined (_RTCORBA_MUTEX__ARG_TRAITS_TMPLINST_CS_)
+#define _RTCORBA_MUTEX__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTCORBA::Mutex>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTCORBA::Mutex_ptr, \
+        RTCORBA::Mutex_var, \
+        RTCORBA::Mutex_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::Mutex, \
+        TAO::Objref_Traits<RTCORBA::Mutex> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::Mutex, \
+        TAO::Objref_Traits<RTCORBA::Mutex> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::Mutex \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        RTCORBA::Mutex_ptr \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::RTORB::MutexNotFound \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::RTORB::InvalidThreadpool \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        RTCORBA::ThreadpoolLanes \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        RTCORBA::PriorityModel \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        RTCORBA::PriorityBands \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        RTCORBA::ProtocolList \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::RTORB, \
+        TAO::Objref_Traits<RTCORBA::RTORB> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::RTORB, \
+        TAO::Objref_Traits<RTCORBA::RTORB> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::RTORB \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index f8b27af81d8..6eec03110b6 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -26,28 +26,34 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_RTCORBAC_H_
 #define _TAO_IDL_ORIG_RTCORBAC_H_
+
 #include /**/ "ace/pre.h"
-#include "rtcorba_export.h"
 
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+#include "tao/orbconf.h"
+
+#ifndef TAO_RTCORBA_SAFE_INCLUDE
+#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corbafwd.h"
-#include "tao/VarOut_T.h"
+
+#include "tao/IOPC.h"
+#include "tao/TimeBaseC.h"
+#include "tao/PolicyC.h"
+#include "rtcorba_export.h"
+#include "tao/Sequence_T.h"
+#include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
-#include "tao/Sequence_T.h"
-#include "tao/PolicyC.h"
-#include "tao/TimeBaseC.h"
+#include "tao/VarOut_T.h"
 #include "tao/Encodable.h"
-#include "tao/Any_Basic_Impl_T.h"
 
 // Forward references.
 class TAO_Priority_Mapping_Manager;
@@ -59,12 +65,6 @@ class TAO_Network_Priority_Mapping_Manager_var;
 class TAO_Network_Priority_Mapping_Manager_out;
 class TAO_Network_Priority_Mapping;
 
-#ifndef TAO_RTCORBA_SAFE_INCLUDE
-#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
-#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
-
-
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -89,11 +89,19 @@ class TAO_Network_Priority_Mapping;
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  RTCORBA
+namespace TAO
 {
-    // TAO-specific
+  class Collocation_Proxy_Broker;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:48
+
+namespace RTCORBA
+{
+  // TAO-specific
   typedef TAO_Priority_Mapping_Manager PriorityMappingManager;
   typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr;
   typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
@@ -110,62 +118,65 @@ TAO_NAMESPACE  RTCORBA
   typedef TAO_Network_Priority_Mapping NetworkPriorityMapping;
   // End TAO-specific
 
+  // End TAO-specific
+
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
+  // be/be_visitor_typedef/typedef_ch.cpp:333
 
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
+  // be/be_visitor_typedef/typedef_ch.cpp:333
 
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const RTCORBA::Priority minPriority = 0;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const RTCORBA::Priority maxPriority = 32767;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
+  // be/be_visitor_typedef/typedef_ch.cpp:333
 
   typedef CORBA::Long NetworkPriority;
   typedef CORBA::Long_out NetworkPriority_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
+  // be/be_visitor_typedef/typedef_ch.cpp:333
 
   typedef CORBA::ULong ThreadpoolId;
   typedef CORBA::ULong_out ThreadpoolId_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:249
+  // be/be_type.cpp:258
 
   struct ThreadpoolLane;
 
@@ -180,7 +191,7 @@ TAO_NAMESPACE  RTCORBA
     ThreadpoolLane_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  // be/be_visitor_structure/structure_ch.cpp:52
 
   struct TAO_RTCORBA_Export ThreadpoolLane
   {
@@ -193,12 +204,12 @@ TAO_NAMESPACE  RTCORBA
   };
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:91
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CH_)
 #define _RTCORBA_THREADPOOLLANES_CH_
@@ -246,17 +257,17 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  // be/be_visitor_enum/enum_ch.cpp:57
 
   enum PriorityModel
   {
@@ -267,19 +278,18 @@ TAO_NAMESPACE  RTCORBA
   typedef PriorityModel &PriorityModel_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY__ODDS_N_ENDS_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_)
+#define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_
 
   class PriorityModelPolicy;
   typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
-  struct tao_PriorityModelPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -293,30 +303,10 @@ TAO_NAMESPACE  RTCORBA
       >
     PriorityModelPolicy_out;
 
-  struct TAO_RTCORBA_Export tao_PriorityModelPolicy_life
-  {
-    static PriorityModelPolicy_ptr tao_duplicate (PriorityModelPolicy_ptr);
-    static void tao_release (PriorityModelPolicy_ptr);
-    static PriorityModelPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        PriorityModelPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_PriorityModelPolicy_cast
-  {
-    static PriorityModelPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
@@ -327,7 +317,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef PriorityModelPolicy_ptr _ptr_type;
     typedef PriorityModelPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
@@ -337,11 +326,6 @@ TAO_NAMESPACE  RTCORBA
         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 (PriorityModelPolicy_ptr)0;
@@ -350,7 +334,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PriorityModel priority_model (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -360,7 +344,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::Priority server_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -370,9 +354,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -389,24 +376,23 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_THREADPOOLPOLICY__ODDS_N_ENDS_CH_)
-#define _RTCORBA_THREADPOOLPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_)
+#define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_
 
   class ThreadpoolPolicy;
   typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
-  struct tao_ThreadpoolPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -420,30 +406,10 @@ TAO_NAMESPACE  RTCORBA
       >
     ThreadpoolPolicy_out;
 
-  struct TAO_RTCORBA_Export tao_ThreadpoolPolicy_life
-  {
-    static ThreadpoolPolicy_ptr tao_duplicate (ThreadpoolPolicy_ptr);
-    static void tao_release (ThreadpoolPolicy_ptr);
-    static ThreadpoolPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        ThreadpoolPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_ThreadpoolPolicy_cast
-  {
-    static ThreadpoolPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
@@ -454,7 +420,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef ThreadpoolPolicy_ptr _ptr_type;
     typedef ThreadpoolPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
@@ -464,11 +429,6 @@ TAO_NAMESPACE  RTCORBA
         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 (ThreadpoolPolicy_ptr)0;
@@ -477,7 +437,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::ThreadpoolId threadpool (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -487,9 +447,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -506,19 +469,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
 
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
-  struct tao_ProtocolProperties_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -532,30 +494,10 @@ TAO_NAMESPACE  RTCORBA
       >
     ProtocolProperties_out;
 
-  struct TAO_RTCORBA_Export tao_ProtocolProperties_life
-  {
-    static ProtocolProperties_ptr tao_duplicate (ProtocolProperties_ptr);
-    static void tao_release (ProtocolProperties_ptr);
-    static ProtocolProperties_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        ProtocolProperties_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_ProtocolProperties_cast
-  {
-    static ProtocolProperties_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
@@ -567,7 +509,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
@@ -577,11 +518,6 @@ TAO_NAMESPACE  RTCORBA
         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 (ProtocolProperties_ptr)0;
@@ -590,9 +526,12 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -613,12 +552,12 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:249
+  // be/be_type.cpp:258
 
   struct Protocol;
 
@@ -636,7 +575,7 @@ TAO_NAMESPACE  RTCORBA
     Protocol_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  // be/be_visitor_structure/structure_ch.cpp:52
 
   struct TAO_RTCORBA_Export Protocol
   {
@@ -649,12 +588,12 @@ TAO_NAMESPACE  RTCORBA
   };
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:91
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CH_)
 #define _RTCORBA_PROTOCOLLIST_CH_
@@ -702,24 +641,23 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__ODDS_N_ENDS_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_
 
   class ServerProtocolPolicy;
   typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
-  struct tao_ServerProtocolPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -733,30 +671,10 @@ TAO_NAMESPACE  RTCORBA
       >
     ServerProtocolPolicy_out;
 
-  struct TAO_RTCORBA_Export tao_ServerProtocolPolicy_life
-  {
-    static ServerProtocolPolicy_ptr tao_duplicate (ServerProtocolPolicy_ptr);
-    static void tao_release (ServerProtocolPolicy_ptr);
-    static ServerProtocolPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        ServerProtocolPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_ServerProtocolPolicy_cast
-  {
-    static ServerProtocolPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
@@ -767,7 +685,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef ServerProtocolPolicy_ptr _ptr_type;
     typedef ServerProtocolPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
@@ -777,11 +694,6 @@ TAO_NAMESPACE  RTCORBA
         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 (ServerProtocolPolicy_ptr)0;
@@ -790,7 +702,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -800,9 +712,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -819,24 +734,23 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__ODDS_N_ENDS_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_
 
   class ClientProtocolPolicy;
   typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
-  struct tao_ClientProtocolPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -850,30 +764,10 @@ TAO_NAMESPACE  RTCORBA
       >
     ClientProtocolPolicy_out;
 
-  struct TAO_RTCORBA_Export tao_ClientProtocolPolicy_life
-  {
-    static ClientProtocolPolicy_ptr tao_duplicate (ClientProtocolPolicy_ptr);
-    static void tao_release (ClientProtocolPolicy_ptr);
-    static ClientProtocolPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        ClientProtocolPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_ClientProtocolPolicy_cast
-  {
-    static ClientProtocolPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
@@ -884,7 +778,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef ClientProtocolPolicy_ptr _ptr_type;
     typedef ClientProtocolPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
@@ -894,11 +787,6 @@ TAO_NAMESPACE  RTCORBA
         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 (ClientProtocolPolicy_ptr)0;
@@ -907,7 +795,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -917,9 +805,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -936,24 +827,23 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__ODDS_N_ENDS_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_
 
   class PrivateConnectionPolicy;
   typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-  struct tao_PrivateConnectionPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -967,30 +857,10 @@ TAO_NAMESPACE  RTCORBA
       >
     PrivateConnectionPolicy_out;
 
-  struct TAO_RTCORBA_Export tao_PrivateConnectionPolicy_life
-  {
-    static PrivateConnectionPolicy_ptr tao_duplicate (PrivateConnectionPolicy_ptr);
-    static void tao_release (PrivateConnectionPolicy_ptr);
-    static PrivateConnectionPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        PrivateConnectionPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_PrivateConnectionPolicy_cast
-  {
-    static PrivateConnectionPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
@@ -1001,7 +871,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef PrivateConnectionPolicy_ptr _ptr_type;
     typedef PrivateConnectionPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
@@ -1011,11 +880,6 @@ TAO_NAMESPACE  RTCORBA
         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 (PrivateConnectionPolicy_ptr)0;
@@ -1024,9 +888,12 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1043,19 +910,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_
 
   class TCPProtocolProperties;
   typedef TCPProtocolProperties *TCPProtocolProperties_ptr;
-  struct tao_TCPProtocolProperties_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -1069,30 +935,10 @@ TAO_NAMESPACE  RTCORBA
       >
     TCPProtocolProperties_out;
 
-  struct TAO_RTCORBA_Export tao_TCPProtocolProperties_life
-  {
-    static TCPProtocolProperties_ptr tao_duplicate (TCPProtocolProperties_ptr);
-    static void tao_release (TCPProtocolProperties_ptr);
-    static TCPProtocolProperties_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        TCPProtocolProperties_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_TCPProtocolProperties_cast
-  {
-    static TCPProtocolProperties_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
@@ -1103,7 +949,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef TCPProtocolProperties_ptr _ptr_type;
     typedef TCPProtocolProperties_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
@@ -1113,11 +958,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static TCPProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static TCPProtocolProperties_ptr _nil (void)
       {
         return (TCPProtocolProperties_ptr)0;
@@ -1126,7 +966,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1136,7 +976,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
@@ -1147,7 +987,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1157,7 +997,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
@@ -1168,7 +1008,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean keep_alive (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1178,7 +1018,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void keep_alive (
         CORBA::Boolean keep_alive
@@ -1189,7 +1029,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean dont_route (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1199,7 +1039,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void dont_route (
         CORBA::Boolean dont_route
@@ -1210,7 +1050,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean no_delay (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1220,7 +1060,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void no_delay (
         CORBA::Boolean no_delay
@@ -1231,7 +1071,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean enable_network_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1241,7 +1081,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void enable_network_priority (
         CORBA::Boolean enable_network_priority
@@ -1252,9 +1092,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1271,19 +1114,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_
 
   class GIOPProtocolProperties;
   typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr;
-  struct tao_GIOPProtocolProperties_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -1297,30 +1139,10 @@ TAO_NAMESPACE  RTCORBA
       >
     GIOPProtocolProperties_out;
 
-  struct TAO_RTCORBA_Export tao_GIOPProtocolProperties_life
-  {
-    static GIOPProtocolProperties_ptr tao_duplicate (GIOPProtocolProperties_ptr);
-    static void tao_release (GIOPProtocolProperties_ptr);
-    static GIOPProtocolProperties_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        GIOPProtocolProperties_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_GIOPProtocolProperties_cast
-  {
-    static GIOPProtocolProperties_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
@@ -1331,7 +1153,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef GIOPProtocolProperties_ptr _ptr_type;
     typedef GIOPProtocolProperties_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
@@ -1341,11 +1162,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static GIOPProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static GIOPProtocolProperties_ptr _nil (void)
       {
         return (GIOPProtocolProperties_ptr)0;
@@ -1354,9 +1170,12 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1373,19 +1192,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_
 
   class UnixDomainProtocolProperties;
   typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr;
-  struct tao_UnixDomainProtocolProperties_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -1399,30 +1217,10 @@ TAO_NAMESPACE  RTCORBA
       >
     UnixDomainProtocolProperties_out;
 
-  struct TAO_RTCORBA_Export tao_UnixDomainProtocolProperties_life
-  {
-    static UnixDomainProtocolProperties_ptr tao_duplicate (UnixDomainProtocolProperties_ptr);
-    static void tao_release (UnixDomainProtocolProperties_ptr);
-    static UnixDomainProtocolProperties_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        UnixDomainProtocolProperties_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_UnixDomainProtocolProperties_cast
-  {
-    static UnixDomainProtocolProperties_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
@@ -1433,7 +1231,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef UnixDomainProtocolProperties_ptr _ptr_type;
     typedef UnixDomainProtocolProperties_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
@@ -1443,11 +1240,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static UnixDomainProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static UnixDomainProtocolProperties_ptr _nil (void)
       {
         return (UnixDomainProtocolProperties_ptr)0;
@@ -1456,7 +1248,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1466,7 +1258,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
@@ -1477,7 +1269,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1487,7 +1279,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
@@ -1498,9 +1290,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1517,19 +1312,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_
 
   class SharedMemoryProtocolProperties;
   typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr;
-  struct tao_SharedMemoryProtocolProperties_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -1543,30 +1337,10 @@ TAO_NAMESPACE  RTCORBA
       >
     SharedMemoryProtocolProperties_out;
 
-  struct TAO_RTCORBA_Export tao_SharedMemoryProtocolProperties_life
-  {
-    static SharedMemoryProtocolProperties_ptr tao_duplicate (SharedMemoryProtocolProperties_ptr);
-    static void tao_release (SharedMemoryProtocolProperties_ptr);
-    static SharedMemoryProtocolProperties_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        SharedMemoryProtocolProperties_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_SharedMemoryProtocolProperties_cast
-  {
-    static SharedMemoryProtocolProperties_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
@@ -1577,7 +1351,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef SharedMemoryProtocolProperties_ptr _ptr_type;
     typedef SharedMemoryProtocolProperties_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
@@ -1587,11 +1360,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static SharedMemoryProtocolProperties_ptr _nil (void)
       {
         return (SharedMemoryProtocolProperties_ptr)0;
@@ -1600,7 +1368,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long preallocate_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1610,7 +1378,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void preallocate_buffer_size (
         CORBA::Long preallocate_buffer_size
@@ -1621,7 +1389,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual char * mmap_filename (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1631,7 +1399,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void mmap_filename (
         const char * mmap_filename
@@ -1642,7 +1410,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual char * mmap_lockname (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1652,7 +1420,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void mmap_lockname (
         const char * mmap_lockname
@@ -1663,9 +1431,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1682,12 +1453,12 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:249
+  // be/be_type.cpp:258
 
   struct PriorityBand;
 
@@ -1702,7 +1473,7 @@ TAO_NAMESPACE  RTCORBA
     PriorityBand_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  // be/be_visitor_structure/structure_ch.cpp:52
 
   struct TAO_RTCORBA_Export PriorityBand
   {
@@ -1714,12 +1485,12 @@ TAO_NAMESPACE  RTCORBA
   };
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:91
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CH_)
 #define _RTCORBA_PRIORITYBANDS_CH_
@@ -1767,24 +1538,23 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ODDS_N_ENDS_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_
 
   class PriorityBandedConnectionPolicy;
   typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
-  struct tao_PriorityBandedConnectionPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -1798,30 +1568,10 @@ TAO_NAMESPACE  RTCORBA
       >
     PriorityBandedConnectionPolicy_out;
 
-  struct TAO_RTCORBA_Export tao_PriorityBandedConnectionPolicy_life
-  {
-    static PriorityBandedConnectionPolicy_ptr tao_duplicate (PriorityBandedConnectionPolicy_ptr);
-    static void tao_release (PriorityBandedConnectionPolicy_ptr);
-    static PriorityBandedConnectionPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        PriorityBandedConnectionPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_PriorityBandedConnectionPolicy_cast
-  {
-    static PriorityBandedConnectionPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
@@ -1832,7 +1582,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
     typedef PriorityBandedConnectionPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
@@ -1842,11 +1591,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static PriorityBandedConnectionPolicy_ptr _nil (void)
       {
         return (PriorityBandedConnectionPolicy_ptr)0;
@@ -1855,7 +1599,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PriorityBands * priority_bands (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1865,9 +1609,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1884,19 +1631,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_CURRENT__ODDS_N_ENDS_CH_)
-#define _RTCORBA_CURRENT__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_)
+#define _RTCORBA_CURRENT__VAR_OUT_CH_
 
   class Current;
   typedef Current *Current_ptr;
-  struct tao_Current_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -1910,30 +1656,10 @@ TAO_NAMESPACE  RTCORBA
       >
     Current_out;
 
-  struct TAO_RTCORBA_Export tao_Current_life
-  {
-    static Current_ptr tao_duplicate (Current_ptr);
-    static void tao_release (Current_ptr);
-    static Current_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        Current_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_Current_cast
-  {
-    static Current_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_CURRENT_CH_)
 #define _RTCORBA_CURRENT_CH_
@@ -1944,7 +1670,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
@@ -1954,11 +1679,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
@@ -1967,7 +1687,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::Priority the_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1977,7 +1697,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void the_priority (
         RTCORBA::Priority the_priority
@@ -1988,9 +1708,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -2007,19 +1730,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_MUTEX__ODDS_N_ENDS_CH_)
-#define _RTCORBA_MUTEX__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_)
+#define _RTCORBA_MUTEX__VAR_OUT_CH_
 
   class Mutex;
   typedef Mutex *Mutex_ptr;
-  struct tao_Mutex_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -2033,30 +1755,10 @@ TAO_NAMESPACE  RTCORBA
       >
     Mutex_out;
 
-  struct TAO_RTCORBA_Export tao_Mutex_life
-  {
-    static Mutex_ptr tao_duplicate (Mutex_ptr);
-    static void tao_release (Mutex_ptr);
-    static Mutex_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        Mutex_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_Mutex_cast
-  {
-    static Mutex_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_MUTEX_CH_)
 #define _RTCORBA_MUTEX_CH_
@@ -2067,7 +1769,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef Mutex_ptr _ptr_type;
     typedef Mutex_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static Mutex_ptr _duplicate (Mutex_ptr obj);
@@ -2077,11 +1778,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static Mutex_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static Mutex_ptr _nil (void)
       {
         return (Mutex_ptr)0;
@@ -2090,7 +1786,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void lock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2100,7 +1796,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void unlock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2110,7 +1806,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean try_lock (
         TimeBase::TimeT max_wait
@@ -2121,9 +1817,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -2140,19 +1839,18 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTCORBA_RTORB__ODDS_N_ENDS_CH_)
-#define _RTCORBA_RTORB__ODDS_N_ENDS_CH_
+#if !defined (_RTCORBA_RTORB__VAR_OUT_CH_)
+#define _RTCORBA_RTORB__VAR_OUT_CH_
 
   class RTORB;
   typedef RTORB *RTORB_ptr;
-  struct tao_RTORB_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -2166,30 +1864,10 @@ TAO_NAMESPACE  RTCORBA
       >
     RTORB_out;
 
-  struct TAO_RTCORBA_Export tao_RTORB_life
-  {
-    static RTORB_ptr tao_duplicate (RTORB_ptr);
-    static void tao_release (RTORB_ptr);
-    static RTORB_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        RTORB_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTCORBA_Export tao_RTORB_cast
-  {
-    static RTORB_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTCORBA_RTORB_CH_)
 #define _RTCORBA_RTORB_CH_
@@ -2200,7 +1878,6 @@ TAO_NAMESPACE  RTCORBA
   public:
     typedef RTORB_ptr _ptr_type;
     typedef RTORB_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static RTORB_ptr _duplicate (RTORB_ptr obj);
@@ -2210,11 +1887,6 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static RTORB_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static RTORB_ptr _nil (void)
       {
         return (RTORB_ptr)0;
@@ -2223,7 +1895,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::Mutex_ptr create_mutex (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2233,7 +1905,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy_mutex (
         RTCORBA::Mutex_ptr the_mutex
@@ -2244,7 +1916,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+    // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_)
 #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_
@@ -2270,29 +1942,29 @@ TAO_NAMESPACE  RTCORBA
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      // be/be_visitor_exception/exception_ch.cpp:125
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    // be/be_visitor_typecode/typecode_decl.cpp:44
 
     static ::CORBA::TypeCode_ptr _tc_MutexNotFound;
 
 #endif /* end #if !defined */
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
@@ -2304,7 +1976,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
@@ -2316,7 +1988,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
         CORBA::Long send_buffer_size,
@@ -2332,7 +2004,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+    // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
 #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
@@ -2358,29 +2030,29 @@ TAO_NAMESPACE  RTCORBA
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      // be/be_visitor_exception/exception_ch.cpp:125
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    // be/be_visitor_typecode/typecode_decl.cpp:44
 
     static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool;
 
 #endif /* end #if !defined */
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::ThreadpoolId create_threadpool (
         CORBA::ULong stacksize,
@@ -2397,7 +2069,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
         CORBA::ULong stacksize,
@@ -2413,7 +2085,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy_threadpool (
         RTCORBA::ThreadpoolId threadpool
@@ -2425,7 +2097,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         RTCORBA::PriorityModel priority_model,
@@ -2437,7 +2109,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
         RTCORBA::ThreadpoolId threadpool
@@ -2448,7 +2120,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
         const RTCORBA::PriorityBands & priority_bands
@@ -2459,7 +2131,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const RTCORBA::ProtocolList & protocols
@@ -2470,7 +2142,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
         const RTCORBA::ProtocolList & protocols
@@ -2481,7 +2153,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2491,9 +2163,12 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -2510,18 +2185,25 @@ TAO_NAMESPACE  RTCORBA
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RTORB;
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+// be/be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module RTCORBA
+} // module RTCORBA
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_traits.cpp:48
+
+// Traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version
@@ -2529,7 +2211,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version
@@ -2537,34 +2219,34 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+// be/be_visitor_enum/any_op_ch.cpp:51
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel);
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version
@@ -2572,7 +2254,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version
@@ -2580,56 +2262,56 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version
@@ -2637,7 +2319,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version
@@ -2645,35 +2327,35 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version
@@ -2681,7 +2363,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version
@@ -2689,18 +2371,18 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
+// be/be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
+// be/be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
@@ -2717,19 +2399,19 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+// 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_InputCDR &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
+// be/be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::Protocol &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::Protocol &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
+// be/be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_RTCORBA_ProtocolList_H_
 #define _TAO_CDR_OP_RTCORBA_ProtocolList_H_
@@ -2746,13 +2428,13 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ProtocolList_H_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
+// be/be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
+// be/be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_H_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_H_
@@ -2769,12 +2451,12 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RTCORBAC.i"
@@ -2788,7 +2470,5 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #pragma option pop
 #endif /* __BORLANDC__ */
 
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
 #include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i
index ac9ac7663e8..7bdd965d7ef 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.i
+++ b/TAO/tao/RTCORBA/RTCORBAC.i
@@ -27,529 +27,119 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___CI_)
 #define _RTCORBA_PRIORITYMODELPOLICY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY___CI_)
 #define _RTCORBA_THREADPOOLPOLICY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_PROTOCOLPROPERTIES___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_CURRENT___CI_)
 #define _RTCORBA_CURRENT___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Current>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_MUTEX___CI_)
 #define _RTCORBA_MUTEX___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Mutex>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTCORBA_RTORB___CI_)
 #define _RTCORBA_RTORB___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::RTORB>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -576,7 +166,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_
@@ -594,7 +184,7 @@ CORBA::Boolean TAO_RTCORBA_Export operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+// be/be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval)
@@ -618,7 +208,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -648,7 +238,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_RTCORBA_ProtocolList_I_
 #define _TAO_CDR_OP_RTCORBA_ProtocolList_I_
@@ -666,7 +256,7 @@ CORBA::Boolean TAO_RTCORBA_Export operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ProtocolList_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -691,7 +281,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_I_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_I_
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 7168397842c..722f5150235 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -15,20 +15,35 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+// be/be_codegen.cpp:301
 
 
 #include "RTPortableServerC.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+#include "tao/Stub.h"
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
@@ -36,12 +51,58 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// be/be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTPortableServer_Export Arg_Traits<CORBA::OctetSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::OctetSeq,
+            CORBA::OctetSeq_var,
+            CORBA::OctetSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTPortableServer_Export Arg_Traits<PortableServer::ObjectId>
+    : public
+        Var_Size_Arg_Traits_T<
+            PortableServer::ObjectId,
+            PortableServer::ObjectId_var,
+            PortableServer::ObjectId_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTPortableServer::POA::_tao_class_id = 0;
+// Traits specializations for RTPortableServer::POA.
 
 RTPortableServer::POA_ptr
-RTPortableServer::tao_POA_life::tao_duplicate (
+TAO::Objref_Traits<RTPortableServer::POA>::tao_duplicate (
     RTPortableServer::POA_ptr p
   )
 {
@@ -49,7 +110,7 @@ RTPortableServer::tao_POA_life::tao_duplicate (
 }
 
 void
-RTPortableServer::tao_POA_life::tao_release (
+TAO::Objref_Traits<RTPortableServer::POA>::tao_release (
     RTPortableServer::POA_ptr p
   )
 {
@@ -57,67 +118,25 @@ RTPortableServer::tao_POA_life::tao_release (
 }
 
 RTPortableServer::POA_ptr
-RTPortableServer::tao_POA_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTPortableServer::POA>::tao_nil (void)
 {
   return RTPortableServer::POA::_nil ();
 }
 
 CORBA::Boolean
-RTPortableServer::tao_POA_life::tao_marshal (
+TAO::Objref_Traits<RTPortableServer::POA>::tao_marshal (
     RTPortableServer::POA_ptr p,
-    TAO_OutputCDR &cdr
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTPortableServer::POA_ptr
-RTPortableServer::tao_POA_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTPortableServer::tao_POA_cast::tao_upcast (
-    void *src
-  )
-{
-  RTPortableServer::POA **tmp =
-    ACE_static_cast (RTPortableServer::POA **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTPortableServer::POA,
-        RTPortableServer::tao_POA_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTPortableServer::POA,
-        RTPortableServer::tao_POA_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTPortableServer::POA, \
-        RTPortableServer::tao_POA_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTPortableServer::POA, \
-        RTPortableServer::tao_POA_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTPortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTPortableServer::POA::POA (void)
 {}
@@ -125,43 +144,24 @@ RTPortableServer::POA::POA (void)
 RTPortableServer::POA::~POA (void)
 {}
 
-void
+void 
 RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
-  POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
-  CORBA::release (tmp);
+  POA *_tao_tmp_pointer =
+    ACE_static_cast (POA *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 RTPortableServer::POA_ptr
 RTPortableServer::POA::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTPortableServer::POA_ptr
-RTPortableServer::POA::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return POA::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          POA_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &POA::_tao_class_id
-                )
-            )
-        );
+  POA_ptr proxy =
+    dynamic_cast<POA_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTPortableServer::POA_ptr
@@ -171,53 +171,41 @@ RTPortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *RTPortableServer::POA::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTPortableServer::POA::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTPortableServer, POA)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/POA:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTPortableServer/POA:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::PortableServer::POA::_tao_class_id)
-            )
+  else
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                PortableServer::POA_ptr,
-                this
-              )
-          );
+      return 0;
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
 }
 
 const char* RTPortableServer::POA::_interface_repository_id (void) const
@@ -232,21 +220,21 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 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 (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
@@ -260,17 +248,14 @@ static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
     sizeof (RTPortableServer::POA)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTPortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_POA,
-    &_tc_TAO_tc_RTPortableServer_POA
-  )
-TAO_NAMESPACE_END
+namespace RTPortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_POA =
+    &_tc_TAO_tc_RTPortableServer_POA;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -314,13 +299,464 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-//  template class TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>;
-  template class TAO::Any_Impl_T<RTPortableServer::POA>;
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTPortableServer::POA>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::SetOverrideType
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::PolicyError
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::InvalidPolicies
+      >;
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::OctetSeq>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::OctetSeq,
+        CORBA::OctetSeq_var,
+        CORBA::OctetSeq_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::TCKind
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::exception_type
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::ParameterMode
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::AdapterAlreadyExists
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::AdapterNonExistent
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::InvalidPolicy
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::NoServant
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ObjectAlreadyActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ObjectNotActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ServantAlreadyActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ServantNotActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::WrongAdapter
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::WrongPolicy
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::ForwardRequest
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::NotAGroupObject
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ThreadPolicyValue
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::LifespanPolicyValue
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::IdUniquenessPolicyValue
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::IdAssignmentPolicyValue
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ImplicitActivationPolicyValue
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ServantRetentionPolicyValue
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::RequestProcessingPolicyValue
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POAManager::AdapterInactive
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::POAManager::State
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::Current::NoContext
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::Codec::InvalidTypeForEncoding
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::Codec::FormatMismatch
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::Codec::TypeMismatch
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        IOP::CodecFactory::UnknownEncoding
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        RTCORBA::PriorityModel
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::RTORB::MutexNotFound
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::RTORB::InvalidThreadpool
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::Ret_Var_Size_Argument_T<
+        CORBA::sequence,
+        CORBA::sequence_var
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTPortableServer::POA,
+        TAO::Objref_Traits<RTPortableServer::POA>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTPortableServer::POA,
+        TAO::Objref_Traits<RTPortableServer::POA>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTPortableServer::POA
+      >;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// # pragma instantiate TAO_Object_Manager<RTPortableServer::POA, RTPortableServer::POA_var>
-# pragma instantiate TAO::Any_Impl_T<RTPortableServer::POA>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 */
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::SetOverrideType \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::PolicyError \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::InvalidPolicies \
+      >
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::OctetSeq>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::OctetSeq, \
+        CORBA::OctetSeq_var, \
+        CORBA::OctetSeq_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::TCKind \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::exception_type \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::ParameterMode \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::AdapterAlreadyExists \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::AdapterNonExistent \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::InvalidPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::NoServant \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ObjectAlreadyActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ObjectNotActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ServantAlreadyActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ServantNotActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::WrongAdapter \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::WrongPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::ForwardRequest \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::NotAGroupObject \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ThreadPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::LifespanPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::IdUniquenessPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::IdAssignmentPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ImplicitActivationPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ServantRetentionPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::RequestProcessingPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POAManager::AdapterInactive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::POAManager::State \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::Current::NoContext \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::Codec::InvalidTypeForEncoding \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::Codec::FormatMismatch \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::Codec::TypeMismatch \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        IOP::CodecFactory::UnknownEncoding \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        RTCORBA::PriorityModel \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::RTORB::MutexNotFound \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::RTORB::InvalidThreadpool \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTPortableServer::POA, \
+        TAO::Objref_Traits<RTPortableServer::POA> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTPortableServer::POA, \
+        TAO::Objref_Traits<RTPortableServer::POA> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTPortableServer::POA \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index 49374a20a10..8587caa0f75 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -15,30 +15,40 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 
 #include /**/ "ace/pre.h"
-#include "rtportableserver_export.h"
-
-#include "tao/PortableServer/PortableServerC.h"
 
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
+
+#include "rtportableserver_export.h"
+#include "tao/Sequence_T.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/VarOut_T.h"
+
+#include "tao/PortableServer/PortableServerC.h"
+#include "tao/RTCORBA/RTCORBA.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,20 +74,27 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  RTPortableServer
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:48
+
+namespace RTPortableServer
 {
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // be/be_interface.cpp:601
 
-#if !defined (_RTPORTABLESERVER_POA__ODDS_N_ENDS_CH_)
-#define _RTPORTABLESERVER_POA__ODDS_N_ENDS_CH_
+#if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
+#define _RTPORTABLESERVER_POA__VAR_OUT_CH_
 
   class POA;
   typedef POA *POA_ptr;
-  struct tao_POA_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -91,30 +108,10 @@ TAO_NAMESPACE  RTPortableServer
       >
     POA_out;
 
-  struct TAO_RTPortableServer_Export tao_POA_life
-  {
-    static POA_ptr tao_duplicate (POA_ptr);
-    static void tao_release (POA_ptr);
-    static POA_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        POA_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTPortableServer_Export tao_POA_cast
-  {
-    static POA_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
@@ -125,7 +122,6 @@ TAO_NAMESPACE  RTPortableServer
   public:
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
@@ -135,11 +131,6 @@ TAO_NAMESPACE  RTPortableServer
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static POA_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static POA_ptr _nil (void)
       {
         return (POA_ptr)0;
@@ -148,7 +139,7 @@ TAO_NAMESPACE  RTPortableServer
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
@@ -161,7 +152,7 @@ TAO_NAMESPACE  RTPortableServer
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Object_ptr create_reference_with_id_and_priority (
         const PortableServer::ObjectId & oid,
@@ -175,7 +166,7 @@ TAO_NAMESPACE  RTPortableServer
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
@@ -189,7 +180,7 @@ TAO_NAMESPACE  RTPortableServer
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void activate_object_with_id_and_priority (
         const PortableServer::ObjectId & oid,
@@ -205,9 +196,12 @@ TAO_NAMESPACE  RTPortableServer
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -224,35 +218,42 @@ TAO_NAMESPACE  RTPortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+// be/be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module RTPortableServer
+} // module RTPortableServer
+
+// TAO_IDL - Generated from
+// be/be_visitor_traits.cpp:48
+
+// Traits specializations.
+namespace TAO
+{
+};
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr); // copying
 TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr *); // non-copying
 TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerC.i"
@@ -266,7 +267,5 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 #pragma option pop
 #endif /* __BORLANDC__ */
 
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
 #include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
index ddbfdcf62e4..25826589231 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.i
@@ -15,42 +15,22 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTPORTABLESERVER_POA___CI_)
 #define _RTPORTABLESERVER_POA___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTPortableServer::POA>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
+
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index ccdc7f4b199..91008679229 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -1,17 +1,19 @@
 //$Id$
 #ifndef TAO_RTSCHEDULER_CURRENT_H
 #define TAO_RTSCHEDULER_CURRENT_H
+#include /**/ "ace/pre.h"
 
-
-#include "ace/Hash_Map_Manager_T.h"
 #include "rtscheduler_export.h"
-#include "RTScheduler.h"
-#include "ace/Task.h"
-#include "ace/Atomic_Op.h"
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "RTScheduler.h"
+#include "tao/LocalObject.h"
+#include "ace/Hash_Map_Manager_T.h"
+#include "ace/Task.h"
+#include "ace/Atomic_Op.h"
 
 
 class TAO_RTScheduler_Current_i;
@@ -39,22 +41,22 @@ public:
 };
 
 
-typedef ACE_Hash_Map_Manager_Ex<IdType, 
-                                RTScheduling::DistributableThread_var, 
-                                TAO_DTId_Hash, 
-                                ACE_Equal_To<IdType>, 
-                                TAO_SYNCH_MUTEX> 
+typedef ACE_Hash_Map_Manager_Ex<IdType,
+                                RTScheduling::DistributableThread_var,
+                                TAO_DTId_Hash,
+                                ACE_Equal_To<IdType>,
+                                TAO_SYNCH_MUTEX>
   DT_Hash_Map;
 
-typedef ACE_Hash_Map_Iterator_Ex<IdType, 
-                                 RTScheduling::DistributableThread_var, 
-                                 TAO_DTId_Hash, 
-                                 ACE_Equal_To<IdType>, 
-                                 TAO_SYNCH_MUTEX> 
+typedef ACE_Hash_Map_Iterator_Ex<IdType,
+                                 RTScheduling::DistributableThread_var,
+                                 TAO_DTId_Hash,
+                                 ACE_Equal_To<IdType>,
+                                 TAO_SYNCH_MUTEX>
   DT_Hash_Map_Iterator;
 
 typedef ACE_Hash_Map_Entry<IdType,
-                           RTScheduling::DistributableThread_var> 
+                           RTScheduling::DistributableThread_var>
   DT_Hash_Map_Entry;
 
 class TAO_RTScheduler_Current;
@@ -67,11 +69,11 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
     public TAO_Local_RefCounted_Object
 {
  public:
-  
+
   TAO_RTScheduler_Current (void);
 
-  void init (TAO_ORB_Core* orb 
-	     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void init (TAO_ORB_Core* orb
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -81,31 +83,31 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void rt_current (RTCORBA::Current_ptr rt_current);
-  
+
   virtual void begin_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
      CORBA::Policy_ptr implicit_sched_param
      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-    
+                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+
   virtual void update_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
      CORBA::Policy_ptr implicit_sched_param
      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment
     (const char * name
      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual RTScheduling::DistributableThread_ptr 
+
+  virtual RTScheduling::DistributableThread_ptr
     lookup(const RTScheduling::Current::IdType & id
-	   ACE_ENV_ARG_DECL_NOT_USED)
+           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // returns a null reference if
@@ -114,30 +116,30 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
 
   virtual RTScheduling::DistributableThread_ptr
     spawn (RTScheduling::ThreadAction_ptr start,
-	   CORBA::VoidData data,
-	   const char* name,
-	   CORBA::Policy_ptr sched_param,
-	   CORBA::Policy_ptr implicit_sched_param,
-	   CORBA::ULong stack_size,
-	   RTCORBA::Priority base_priority
-	   ACE_ENV_ARG_DECL)
+           CORBA::VoidData data,
+           const char* name,
+           CORBA::Policy_ptr sched_param,
+           CORBA::Policy_ptr implicit_sched_param,
+           CORBA::ULong stack_size,
+           RTCORBA::Priority base_priority
+           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual ::RTScheduling::Current::IdType * 
+  virtual ::RTScheduling::Current::IdType *
     id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual ::CORBA::Policy_ptr 
+
+  virtual ::CORBA::Policy_ptr
     scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual ::CORBA::Policy_ptr 
+
+  virtual ::CORBA::Policy_ptr
     implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual ::RTScheduling::Current::NameList * 
+
+  virtual ::RTScheduling::Current::NameList *
     current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));  
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   TAO_RTScheduler_Current_i* implementation (void);
 
@@ -182,7 +184,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
   RTCORBA::Current_var rt_current_;
   TAO_ORB_Core* orb_;
   DT_Hash_Map dt_hash_;
-  
+
 };
 
 
@@ -238,18 +240,18 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
  public:
 
   TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-			     DT_Hash_Map* dt_hash
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             DT_Hash_Map* dt_hash
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-			     DT_Hash_Map* dt_hash,
-			     RTScheduling::Current::IdType guid,
-			     const char * name,
-			     CORBA::Policy_ptr sched_param,
-			     CORBA::Policy_ptr implicit_sched_param,
-			     RTScheduling::DistributableThread_ptr dt,
-			     TAO_RTScheduler_Current_i* prev_current
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             DT_Hash_Map* dt_hash,
+                             RTScheduling::Current::IdType guid,
+                             const char * name,
+                             CORBA::Policy_ptr sched_param,
+                             CORBA::Policy_ptr implicit_sched_param,
+                             RTScheduling::DistributableThread_ptr dt,
+                             TAO_RTScheduler_Current_i* prev_current
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual ~TAO_RTScheduler_Current_i (void)
     {
@@ -257,66 +259,66 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
 
   virtual RTScheduling::DistributableThread_ptr
     spawn (RTScheduling::ThreadAction_ptr start,
-	   CORBA::VoidData data,
-	   const char* name,
-	   CORBA::Policy_ptr sched_param,
-	   CORBA::Policy_ptr implicit_sched_param,
-	   CORBA::ULong stack_size,
-	   RTCORBA::Priority base_priority
-	   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+           CORBA::VoidData data,
+           const char* name,
+           CORBA::Policy_ptr sched_param,
+           CORBA::Policy_ptr implicit_sched_param,
+           CORBA::ULong stack_size,
+           RTCORBA::Priority base_priority
+           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual void begin_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
      CORBA::Policy_ptr implicit_sched_param
      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-  
+                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+
   virtual void update_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
      CORBA::Policy_ptr implicit_sched_param
      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment
     (const char * name
      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual RTScheduling::Current::IdType * 
+
+  virtual RTScheduling::Current::IdType *
     id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-   
+
   void  id (RTScheduling::Current::IdType guid );
-  
-  virtual CORBA::Policy_ptr 
+
+  virtual CORBA::Policy_ptr
     scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Policy_ptr 
+
+  virtual CORBA::Policy_ptr
     implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   void scheduling_parameter (CORBA::Policy_ptr);
-  
+
   void implicit_scheduling_parameter (CORBA::Policy_ptr);
-  
-  virtual RTScheduling::Current::NameList * 
+
+  virtual RTScheduling::Current::NameList *
     current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException)); 
-  
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   void cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void cleanup_DT (void);
 
-  void cleanup_current (void);		
+  void cleanup_current (void);
 
   void delete_all_currents (void);
 
@@ -349,19 +351,19 @@ class DTTask : public ACE_Task <ACE_SYNCH>
 {
 public:
   DTTask (//ACE_Thread_Manager manager,
-	  TAO_ORB_Core* orb,
-	  DT_Hash_Map* dt_hash,
-	  TAO_RTScheduler_Current_i*,	  
-	  RTScheduling::ThreadAction_ptr start,
-	  CORBA::VoidData data,
-	  const char* name,
-	  CORBA::Policy_ptr sched_param,
-	  CORBA::Policy_ptr implicit_sched_param);
-	  
+          TAO_ORB_Core* orb,
+          DT_Hash_Map* dt_hash,
+          TAO_RTScheduler_Current_i*,
+          RTScheduling::ThreadAction_ptr start,
+          CORBA::VoidData data,
+          const char* name,
+          CORBA::Policy_ptr sched_param,
+          CORBA::Policy_ptr implicit_sched_param);
+
   int activate_task (RTCORBA::Priority base_priority,
-		     CORBA::ULong stack_size
-		     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  
+                     CORBA::ULong stack_size
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual int svc (void);
 
  private:
@@ -376,4 +378,6 @@ public:
   CORBA::Policy_var sched_param_;
   CORBA::Policy_var implicit_sched_param_;
 };
+
+#include /**/ "ace/post.h"
 #endif /*TAO_RTSCHEDULER_CURRENT_H*/
diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl
index 0f948988aee..2055bddeb76 100644
--- a/TAO/tao/RTScheduling/RTScheduler.pidl
+++ b/TAO/tao/RTScheduling/RTScheduler.pidl
@@ -1,4 +1,27 @@
 //$Id$
+// ================================================================
+//
+// = LIBRARY
+//   TAO_RTScheduling
+//
+// = FILENAME
+//   RTScheduling.pidl
+//
+// = DESCRIPTION
+//   Some new data types included for GIOP 1.2
+//   This file was used to generate the code in
+//   GIOP*.* The command used to generate code
+//   is:
+//
+//     tao_idl
+//        -o orig -Sa -Gp -Gd -Ge 1 -GT
+//          -Wb,export_macro=TAO_RTScheduler_Export
+//          -Wb,export_include="rtscheduler_export.h"
+//          -Wb,pre_include="ace/pre.h"
+//          -Wb,post_include="ace/post.h"
+//          RTScheduler.pidl
+//
+// ================================================================
 #include <tao/RTCORBA/RTCORBA.pidl>
 #include <tao/PortableServer/PortableServer.pidl>
 #include <tao/PortableInterceptor.pidl>
@@ -13,7 +36,7 @@ module CORBA
     // C:    void*
     // C++:  void*
     // Java: Object
-		
+
 };
 
 module RTScheduling
@@ -29,32 +52,32 @@ module RTScheduling
 
     local interface DistributableThread
     {
-	enum DT_State
-	{
-	  ACTIVE,
-	  CANCELLED
-	};
+        enum DT_State
+        {
+          ACTIVE,
+          CANCELLED
+        };
 
         void cancel();
             // raises CORBA::OBJECT_NOT_FOUND if
             // the distributable thread is
             // not known to the scheduler
-	readonly attribute DT_State state;
+        readonly attribute DT_State state;
     };
 
-    local interface Current 
+    local interface Current
         : RTCORBA::Current
     {
         DistributableThread
             spawn
                 (in ThreadAction      start,
-		in CORBA::VoidData data,
-		in string name,
-	        in CORBA::Policy sched_param,
-      		in CORBA::Policy implicit_sched_param,
+                in CORBA::VoidData data,
+                in string name,
+                in CORBA::Policy sched_param,
+                in CORBA::Policy implicit_sched_param,
                 in unsigned long     stack_size,
                     // zero means use the O/S default
-		in RTCORBA::Priority base_priority);
+                in RTCORBA::Priority base_priority);
 
         exception UNSUPPORTED_SCHEDULING_DISCIPLINE {};
     // The scheduling_parameter argument didn't match the
@@ -97,7 +120,7 @@ module RTScheduling
             // to outmost segment name
     };
 
-    local interface ResourceManager 
+    local interface ResourceManager
         : RTCORBA::Mutex
     {
     };
@@ -120,60 +143,60 @@ module RTScheduling
              in    string         name,
              in    CORBA::Policy  scheduling_parameter);
 
-	void begin_new_scheduling_segment (in Current::IdType guid,
-				      	in string name,
-					in CORBA::Policy sched_param,
-					in CORBA::Policy implicit_sched_param)
-	raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
+        void begin_new_scheduling_segment (in Current::IdType guid,
+                                        in string name,
+                                        in CORBA::Policy sched_param,
+                                        in CORBA::Policy implicit_sched_param)
+        raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
+
+        void begin_nested_scheduling_segment (in Current::IdType guid,
+                                        in string name,
+                                        in CORBA::Policy sched_param,
+                                        in CORBA::Policy implicit_sched_param)
+        raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
 
-	void begin_nested_scheduling_segment (in Current::IdType guid,
-				      	in string name,
-					in CORBA::Policy sched_param,
-					in CORBA::Policy implicit_sched_param)
-	raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
 
+        void update_scheduling_segment (in Current::IdType guid,
+                                        in string name,
+                                        in CORBA::Policy sched_param,
+                                        in CORBA::Policy implicit_sched_param)
+        raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
 
-	void update_scheduling_segment (in Current::IdType guid,
-				      	in string name,
-					in CORBA::Policy sched_param,
-					in CORBA::Policy implicit_sched_param)
-	raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
+        void end_scheduling_segment (in Current::IdType guid,
+                                        in string name);
 
-	void end_scheduling_segment (in Current::IdType guid,
-				      	in string name);
 
+        void end_nested_scheduling_segment (in Current::IdType guid,
+                                        in string name,
+                                        in CORBA::Policy outer_sched_param);
 
-	void end_nested_scheduling_segment (in Current::IdType guid,
-				      	in string name,
-					in CORBA::Policy outer_sched_param);
+        void send_request (in PortableInterceptor::ClientRequestInfo ri)
+        raises (PortableInterceptor::ForwardRequest);
 
-	void send_request (in PortableInterceptor::ClientRequestInfo ri)
-	raises (PortableInterceptor::ForwardRequest);
+        void receive_request (in PortableInterceptor::ServerRequestInfo ri,
+                                out Current::IdType guid,
+                                out string name,
+                                out CORBA::Policy sched_param,
+                                out CORBA::Policy implicit_sched_param)
+        raises (PortableInterceptor::ForwardRequest);
 
-	void receive_request (in PortableInterceptor::ServerRequestInfo ri,
-				out Current::IdType guid,
-			      	out string name,
-				out CORBA::Policy sched_param,
-				out CORBA::Policy implicit_sched_param)
-	raises (PortableInterceptor::ForwardRequest);
+        void send_reply (in PortableInterceptor::ServerRequestInfo ri);
 
-	void send_reply (in PortableInterceptor::ServerRequestInfo ri);
+        void send_exception (in PortableInterceptor::ServerRequestInfo ri)
+        raises (PortableInterceptor::ForwardRequest);
 
-	void send_exception (in PortableInterceptor::ServerRequestInfo ri)
-	raises (PortableInterceptor::ForwardRequest);
+        void send_other (in PortableInterceptor::ServerRequestInfo ri)
+        raises (PortableInterceptor::ForwardRequest);
 
-	void send_other (in PortableInterceptor::ServerRequestInfo ri)
-	raises (PortableInterceptor::ForwardRequest);
-	
-	void receive_reply (in PortableInterceptor::ClientRequestInfo ri);
+        void receive_reply (in PortableInterceptor::ClientRequestInfo ri);
 
-	void receive_exception (in PortableInterceptor::ClientRequestInfo ri)
-	raises (PortableInterceptor::ForwardRequest);
+        void receive_exception (in PortableInterceptor::ClientRequestInfo ri)
+        raises (PortableInterceptor::ForwardRequest);
 
-	void receive_other (in PortableInterceptor::ClientRequestInfo ri)
-	raises (PortableInterceptor::ForwardRequest);
+        void receive_other (in PortableInterceptor::ClientRequestInfo ri)
+        raises (PortableInterceptor::ForwardRequest);
 
-	void cancel (in Current::IdType guid);
+        void cancel (in Current::IdType guid);
     };
 
 };
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index 849cf5e04fe..adc34f429ba 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// be/be_codegen.cpp:301
 
 
-#include "RTScheduler.h"
+#include "RTSchedulerC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -50,88 +48,247 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+
+#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
+#define _CORBA_POLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<CORBA::Policy>
+    : public
+        Object_Arg_Traits_T<
+            CORBA::Policy_ptr,
+            CORBA::Policy_var,
+            CORBA::Policy_out,
+            TAO::Objref_Traits<CORBA::Policy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_POLICY___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_POLICY___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<CORBA::PolicyList>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::PolicyList,
+            CORBA::PolicyList_var,
+            CORBA::PolicyList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
+#define _CORBA_POLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<CORBA::Policy>
+    : public
+        Object_Arg_Traits_T<
+            CORBA::Policy_ptr,
+            CORBA::Policy_var,
+            CORBA::Policy_out,
+            TAO::Objref_Traits<CORBA::Policy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_CS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<PortableInterceptor::ClientRequestInfo>
+    : public
+        Object_Arg_Traits_T<
+            PortableInterceptor::ClientRequestInfo_ptr,
+            PortableInterceptor::ClientRequestInfo_var,
+            PortableInterceptor::ClientRequestInfo_out,
+            TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_CS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<PortableInterceptor::ServerRequestInfo>
+    : public
+        Object_Arg_Traits_T<
+            PortableInterceptor::ServerRequestInfo_ptr,
+            PortableInterceptor::ServerRequestInfo_var,
+            PortableInterceptor::ServerRequestInfo_out,
+            TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTSCHEDULING_THREADACTION__ARG_TRAITS_CS_)
+#define _RTSCHEDULING_THREADACTION__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<RTScheduling::ThreadAction>
+    : public
+        Object_Arg_Traits_T<
+            RTScheduling::ThreadAction_ptr,
+            RTScheduling::ThreadAction_var,
+            RTScheduling::ThreadAction_out,
+            TAO::Objref_Traits<RTScheduling::ThreadAction>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__ARG_TRAITS_CS_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<RTScheduling::DistributableThread>
+    : public
+        Object_Arg_Traits_T<
+            RTScheduling::DistributableThread_ptr,
+            RTScheduling::DistributableThread_var,
+            RTScheduling::DistributableThread_out,
+            TAO::Objref_Traits<RTScheduling::DistributableThread>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:390
+
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_DT_STATE__ARG_TRAITS_CS_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD_DT_STATE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<RTScheduling::DistributableThread::DT_State>
+    : public
+        Basic_Arg_Traits_T<
+            RTScheduling::DistributableThread::DT_State
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<RTScheduling::Current::IdType>
+    : public
+        Var_Size_Arg_Traits_T<
+            RTScheduling::Current::IdType,
+            RTScheduling::Current::IdType_var,
+            RTScheduling::Current::IdType_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<RTScheduling::Current::NameList>
+    : public
+        Var_Size_Arg_Traits_T<
+            RTScheduling::Current::NameList,
+            RTScheduling::Current::NameList_var,
+            RTScheduling::Current::NameList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTSCHEDULING_RESOURCEMANAGER__ARG_TRAITS_CS_)
+#define _RTSCHEDULING_RESOURCEMANAGER__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<RTScheduling::ResourceManager>
+    : public
+        Object_Arg_Traits_T<
+            RTScheduling::ResourceManager_ptr,
+            RTScheduling::ResourceManager_var,
+            RTScheduling::ResourceManager_out,
+            TAO::Objref_Traits<RTScheduling::ResourceManager>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTScheduling::ThreadAction::_tao_class_id = 0;
+// Traits specializations for RTScheduling::ThreadAction.
 
 RTScheduling::ThreadAction_ptr
-RTScheduling::tao_ThreadAction_life::tao_duplicate (
-    ThreadAction_ptr p
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate (
+    RTScheduling::ThreadAction_ptr p
   )
 {
-  return ThreadAction::_duplicate (p);
+  return RTScheduling::ThreadAction::_duplicate (p);
 }
 
 void
-RTScheduling::tao_ThreadAction_life::tao_release (
-    ThreadAction_ptr p
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release (
+    RTScheduling::ThreadAction_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTScheduling::ThreadAction_ptr
-RTScheduling::tao_ThreadAction_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_nil (void)
 {
-  return ThreadAction::_nil ();
+  return RTScheduling::ThreadAction::_nil ();
 }
 
 CORBA::Boolean
-RTScheduling::tao_ThreadAction_life::tao_marshal (
-    ThreadAction_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_marshal (
+    RTScheduling::ThreadAction_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTScheduling::ThreadAction_ptr
-RTScheduling::tao_ThreadAction_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ThreadAction::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTScheduling::tao_ThreadAction_cast::tao_upcast (
-    void *src
-  )
-{
-  ThreadAction **tmp =
-    ACE_static_cast (ThreadAction **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTScheduling::ThreadAction,
-        RTScheduling::tao_ThreadAction_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTScheduling::ThreadAction,
-        RTScheduling::tao_ThreadAction_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTScheduling::ThreadAction, \
-        RTScheduling::tao_ThreadAction_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTScheduling::ThreadAction, \
-        RTScheduling::tao_ThreadAction_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTScheduling__TAO_ThreadAction_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTScheduling::ThreadAction::ThreadAction (void)
 {}
@@ -139,43 +296,16 @@ RTScheduling::ThreadAction::ThreadAction (void)
 RTScheduling::ThreadAction::~ThreadAction (void)
 {}
 
-void 
-RTScheduling::ThreadAction::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ThreadAction *tmp = ACE_static_cast (ThreadAction *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
 RTScheduling::ThreadAction_ptr
 RTScheduling::ThreadAction::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ThreadAction::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTScheduling::ThreadAction_ptr 
-RTScheduling::ThreadAction::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ThreadAction::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          ThreadAction_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ThreadAction::_tao_class_id
-                )
-            )
-        );
+  ThreadAction_ptr proxy =
+    dynamic_cast<ThreadAction_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTScheduling::ThreadAction_ptr
@@ -189,35 +319,33 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
   return obj;
 }
 
-void *RTScheduling::ThreadAction::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTScheduling::ThreadAction::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTScheduling, ThreadAction)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:RTScheduling/ThreadAction:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTScheduling::ThreadAction::_interface_repository_id (void) const
@@ -262,98 +390,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ThreadAction (
     sizeof (RTScheduling::ThreadAction)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTScheduling)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadAction,
-    &_tc_TAO_tc_RTScheduling_ThreadAction
-  )
-TAO_NAMESPACE_END
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadAction =
+    &_tc_TAO_tc_RTScheduling_ThreadAction;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTScheduling::DistributableThread::_tao_class_id = 0;
+// Traits specializations for RTScheduling::DistributableThread.
 
 RTScheduling::DistributableThread_ptr
-RTScheduling::tao_DistributableThread_life::tao_duplicate (
-    DistributableThread_ptr p
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate (
+    RTScheduling::DistributableThread_ptr p
   )
 {
-  return DistributableThread::_duplicate (p);
+  return RTScheduling::DistributableThread::_duplicate (p);
 }
 
 void
-RTScheduling::tao_DistributableThread_life::tao_release (
-    DistributableThread_ptr p
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release (
+    RTScheduling::DistributableThread_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTScheduling::DistributableThread_ptr
-RTScheduling::tao_DistributableThread_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_nil (void)
 {
-  return DistributableThread::_nil ();
+  return RTScheduling::DistributableThread::_nil ();
 }
 
 CORBA::Boolean
-RTScheduling::tao_DistributableThread_life::tao_marshal (
-    DistributableThread_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_marshal (
+    RTScheduling::DistributableThread_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTScheduling::DistributableThread_ptr
-RTScheduling::tao_DistributableThread_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DistributableThread::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTScheduling::tao_DistributableThread_cast::tao_upcast (
-    void *src
-  )
-{
-  DistributableThread **tmp =
-    ACE_static_cast (DistributableThread **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTScheduling::DistributableThread,
-        RTScheduling::tao_DistributableThread_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTScheduling::DistributableThread,
-        RTScheduling::tao_DistributableThread_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTScheduling::DistributableThread, \
-        RTScheduling::tao_DistributableThread_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTScheduling::DistributableThread, \
-        RTScheduling::tao_DistributableThread_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTScheduling__TAO_DistributableThread_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTScheduling::DistributableThread::DistributableThread (void)
 {}
@@ -361,43 +444,16 @@ RTScheduling::DistributableThread::DistributableThread (void)
 RTScheduling::DistributableThread::~DistributableThread (void)
 {}
 
-void 
-RTScheduling::DistributableThread::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DistributableThread *tmp = ACE_static_cast (DistributableThread *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
 RTScheduling::DistributableThread_ptr
 RTScheduling::DistributableThread::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DistributableThread::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTScheduling::DistributableThread_ptr 
-RTScheduling::DistributableThread::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return DistributableThread::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          DistributableThread_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &DistributableThread::_tao_class_id
-                )
-            )
-        );
+  DistributableThread_ptr proxy =
+    dynamic_cast<DistributableThread_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTScheduling::DistributableThread_ptr
@@ -411,35 +467,33 @@ RTScheduling::DistributableThread::_duplicate (DistributableThread_ptr obj)
   return obj;
 }
 
-void *RTScheduling::DistributableThread::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTScheduling::DistributableThread::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTScheduling, DistributableThread)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:RTScheduling/DistributableThread:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTScheduling::DistributableThread::_interface_repository_id (void) const
@@ -487,224 +541,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread (
     sizeof (RTScheduling::DistributableThread)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTScheduling)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_DistributableThread,
-    &_tc_TAO_tc_RTScheduling_DistributableThread
-  )
-TAO_NAMESPACE_END
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_DistributableThread =
+    &_tc_TAO_tc_RTScheduling_DistributableThread;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTScheduling::Current::_tao_class_id = 0;
+// Traits specializations for RTScheduling::Current.
 
 RTScheduling::Current_ptr
-RTScheduling::tao_Current_life::tao_duplicate (
-    Current_ptr p
+TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate (
+    RTScheduling::Current_ptr p
   )
 {
-  return Current::_duplicate (p);
+  return RTScheduling::Current::_duplicate (p);
 }
 
 void
-RTScheduling::tao_Current_life::tao_release (
-    Current_ptr p
+TAO::Objref_Traits<RTScheduling::Current>::tao_release (
+    RTScheduling::Current_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTScheduling::Current_ptr
-RTScheduling::tao_Current_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTScheduling::Current>::tao_nil (void)
 {
-  return Current::_nil ();
+  return RTScheduling::Current::_nil ();
 }
 
 CORBA::Boolean
-RTScheduling::tao_Current_life::tao_marshal (
-    Current_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTScheduling::Current>::tao_marshal (
+    RTScheduling::Current_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTScheduling::Current_ptr
-RTScheduling::tao_Current_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTScheduling::tao_Current_cast::tao_upcast (
-    void *src
-  )
-{
-  Current **tmp =
-    ACE_static_cast (Current **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTScheduling::Current,
-        RTScheduling::tao_Current_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTScheduling::Current,
-        RTScheduling::tao_Current_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTScheduling::Current, \
-        RTScheduling::tao_Current_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTScheduling::Current, \
-        RTScheduling::tao_Current_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
-
-RTScheduling::Current::Current (void)
-{}
-
-RTScheduling::Current::~Current (void)
-{}
-
-void 
-RTScheduling::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
-RTScheduling::Current_ptr
-RTScheduling::Current::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTScheduling::Current_ptr 
-RTScheduling::Current::_unchecked_narrow (
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTScheduling__TAO_Current_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return Current::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          Current_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Current::_tao_class_id
-                )
-            )
-        );
-}
-
-RTScheduling::Current_ptr
-RTScheduling::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void *RTScheduling::Current::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTScheduling, Current)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::RTCORBA::Current::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                RTCORBA::Current_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Current::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Current_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
-const char* RTScheduling::Current::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/Current:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::Current::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
+  ) = 0;
 
 // TAO_IDL - Generated from 
 // be/be_visitor_exception/exception_cs.cpp:63
@@ -736,12 +619,6 @@ RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::operator= (const ::RTS
   return *this;
 }
 
-void RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UNSUPPORTED_SCHEDULING_DISCIPLINE *tmp = ACE_static_cast (UNSUPPORTED_SCHEDULING_DISCIPLINE*, _tao_void_pointer);
-  delete tmp;
-}
-
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -849,7 +726,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DI
   &_tc_TAO_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:72
+// be/be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CS_)
 #define _RTSCHEDULING_CURRENT_IDTYPE_CS_
@@ -890,62 +767,6 @@ RTScheduling::Current::IdType::IdType (
 RTScheduling::Current::IdType::~IdType (void)
 {}
 
-void RTScheduling::Current::IdType::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  IdType * tmp =
-    ACE_static_cast (
-        IdType *,
-        _tao_void_pointer
-      );
-  delete tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_FixedSeq_Var_T<
-      RTScheduling::Current::IdType,
-      CORBA::Octet
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      RTScheduling::Current::IdType,
-      CORBA::Octet
-    >;
-
-template class
-  TAO_Seq_Out_T<
-      RTScheduling::Current::IdType,
-      RTScheduling::Current::IdType_var,
-      CORBA::Octet
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_FixedSeq_Var_T< \
-      IdType, \
-      CORBA::Octet \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      IdType, \
-      CORBA::Octet \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      IdType, \
-      IdType_var, \
-      CORBA::Octet \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -988,7 +809,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_IdType (
   &_tc_TAO_tc_RTScheduling_Current_IdType;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:72
+// be/be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CS_)
 #define _RTSCHEDULING_CURRENT_NAMELIST_CS_
@@ -1023,62 +844,6 @@ RTScheduling::Current::NameList::NameList (
 RTScheduling::Current::NameList::~NameList (void)
 {}
 
-void RTScheduling::Current::NameList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  NameList * tmp =
-    ACE_static_cast (
-        NameList *,
-        _tao_void_pointer
-      );
-  delete tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_MngSeq_Var_T<
-      RTScheduling::Current::NameList,
-      TAO_SeqElem_String_Manager
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      RTScheduling::Current::NameList,
-      TAO_SeqElem_String_Manager
-    >;
-
-template class
-  TAO_MngSeq_Out_T<
-      RTScheduling::Current::NameList,
-      RTScheduling::Current::NameList_var,
-      TAO_SeqElem_String_Manager
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_MngSeq_Var_T< \
-      RTScheduling::Current::NameList, \
-      TAO_SeqElem_String_Manager \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      RTScheduling::Current::NameList, \
-      TAO_SeqElem_String_Manager \
-    >
-
-# pragma instantiate \
-  TAO_MngSeq_Out_T< \
-      RTScheduling::Current::NameList, \
-      RTScheduling::Current::NameList_var, \
-      TAO_SeqElem_String_Manager \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1122,6 +887,83 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_NameList (
 ::CORBA::TypeCode_ptr RTScheduling::Current::_tc_NameList =
   &_tc_TAO_tc_RTScheduling_Current_NameList;
 
+RTScheduling::Current::Current (void)
+{}
+
+RTScheduling::Current::~Current (void)
+{}
+
+RTScheduling::Current_ptr
+RTScheduling::Current::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  Current_ptr proxy =
+    dynamic_cast<Current_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
+}
+
+RTScheduling::Current_ptr
+RTScheduling::Current::_duplicate (Current_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+RTScheduling::Current::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:RTScheduling/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* RTScheduling::Current::_interface_repository_id (void) const
+{
+  return "IDL:RTScheduling/Current:1.0";
+}
+
+CORBA::Boolean
+RTScheduling::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1150,98 +992,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current (
     sizeof (RTScheduling::Current)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTScheduling)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Current,
-    &_tc_TAO_tc_RTScheduling_Current
-  )
-TAO_NAMESPACE_END
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_RTScheduling_Current;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTScheduling::ResourceManager::_tao_class_id = 0;
+// Traits specializations for RTScheduling::ResourceManager.
 
 RTScheduling::ResourceManager_ptr
-RTScheduling::tao_ResourceManager_life::tao_duplicate (
-    ResourceManager_ptr p
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate (
+    RTScheduling::ResourceManager_ptr p
   )
 {
-  return ResourceManager::_duplicate (p);
+  return RTScheduling::ResourceManager::_duplicate (p);
 }
 
 void
-RTScheduling::tao_ResourceManager_life::tao_release (
-    ResourceManager_ptr p
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release (
+    RTScheduling::ResourceManager_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTScheduling::ResourceManager_ptr
-RTScheduling::tao_ResourceManager_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_nil (void)
 {
-  return ResourceManager::_nil ();
+  return RTScheduling::ResourceManager::_nil ();
 }
 
 CORBA::Boolean
-RTScheduling::tao_ResourceManager_life::tao_marshal (
-    ResourceManager_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_marshal (
+    RTScheduling::ResourceManager_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTScheduling::ResourceManager_ptr
-RTScheduling::tao_ResourceManager_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ResourceManager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTScheduling::tao_ResourceManager_cast::tao_upcast (
-    void *src
-  )
-{
-  ResourceManager **tmp =
-    ACE_static_cast (ResourceManager **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTScheduling::ResourceManager,
-        RTScheduling::tao_ResourceManager_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTScheduling::ResourceManager,
-        RTScheduling::tao_ResourceManager_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTScheduling::ResourceManager, \
-        RTScheduling::tao_ResourceManager_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTScheduling::ResourceManager, \
-        RTScheduling::tao_ResourceManager_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTScheduling__TAO_ResourceManager_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 RTScheduling::ResourceManager::ResourceManager (void)
 {}
@@ -1249,43 +1046,16 @@ RTScheduling::ResourceManager::ResourceManager (void)
 RTScheduling::ResourceManager::~ResourceManager (void)
 {}
 
-void 
-RTScheduling::ResourceManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ResourceManager *tmp = ACE_static_cast (ResourceManager *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
 RTScheduling::ResourceManager_ptr
 RTScheduling::ResourceManager::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ResourceManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTScheduling::ResourceManager_ptr 
-RTScheduling::ResourceManager::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ResourceManager::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          ResourceManager_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ResourceManager::_tao_class_id
-                )
-            )
-        );
+  ResourceManager_ptr proxy =
+    dynamic_cast<ResourceManager_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 RTScheduling::ResourceManager_ptr
@@ -1299,49 +1069,37 @@ RTScheduling::ResourceManager::_duplicate (ResourceManager_ptr obj)
   return obj;
 }
 
-void *RTScheduling::ResourceManager::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+RTScheduling::ResourceManager::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTScheduling, ResourceManager)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::RTCORBA::Mutex::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                RTCORBA::Mutex_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/Mutex:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:RTScheduling/ResourceManager:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-  
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-  
-  return retv;
 }
 
 const char* RTScheduling::ResourceManager::_interface_repository_id (void) const
@@ -1387,196 +1145,53 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ResourceManager (
     sizeof (RTScheduling::ResourceManager)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTScheduling)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ResourceManager,
-    &_tc_TAO_tc_RTScheduling_ResourceManager
-  )
-TAO_NAMESPACE_END
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_ResourceManager =
+    &_tc_TAO_tc_RTScheduling_ResourceManager;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int RTScheduling::Scheduler::_tao_class_id = 0;
+// Traits specializations for RTScheduling::Scheduler.
 
 RTScheduling::Scheduler_ptr
-RTScheduling::tao_Scheduler_life::tao_duplicate (
-    Scheduler_ptr p
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate (
+    RTScheduling::Scheduler_ptr p
   )
 {
-  return Scheduler::_duplicate (p);
+  return RTScheduling::Scheduler::_duplicate (p);
 }
 
 void
-RTScheduling::tao_Scheduler_life::tao_release (
-    Scheduler_ptr p
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release (
+    RTScheduling::Scheduler_ptr p
   )
 {
   CORBA::release (p);
 }
 
 RTScheduling::Scheduler_ptr
-RTScheduling::tao_Scheduler_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_nil (void)
 {
-  return Scheduler::_nil ();
+  return RTScheduling::Scheduler::_nil ();
 }
 
 CORBA::Boolean
-RTScheduling::tao_Scheduler_life::tao_marshal (
-    Scheduler_ptr p,
-    TAO_OutputCDR &cdr
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_marshal (
+    RTScheduling::Scheduler_ptr p,
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-RTScheduling::Scheduler_ptr
-RTScheduling::tao_Scheduler_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Scheduler::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTScheduling::tao_Scheduler_cast::tao_upcast (
-    void *src
-  )
-{
-  Scheduler **tmp =
-    ACE_static_cast (Scheduler **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        RTScheduling::Scheduler,
-        RTScheduling::tao_Scheduler_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        RTScheduling::Scheduler,
-        RTScheduling::tao_Scheduler_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        RTScheduling::Scheduler, \
-        RTScheduling::tao_Scheduler_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        RTScheduling::Scheduler, \
-        RTScheduling::tao_Scheduler_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
-
-RTScheduling::Scheduler::Scheduler (void)
-{}
-
-RTScheduling::Scheduler::~Scheduler (void)
-{}
-
-void 
-RTScheduling::Scheduler::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Scheduler *tmp = ACE_static_cast (Scheduler *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
-RTScheduling::Scheduler_ptr
-RTScheduling::Scheduler::_narrow (
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTScheduling__TAO_Scheduler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Scheduler::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-RTScheduling::Scheduler_ptr 
-RTScheduling::Scheduler::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return Scheduler::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          Scheduler_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Scheduler::_tao_class_id
-                )
-            )
-        );
-}
-
-RTScheduling::Scheduler_ptr
-RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void *RTScheduling::Scheduler::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::RTScheduling, Scheduler)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
-const char* RTScheduling::Scheduler::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/Scheduler:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::Scheduler::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
+  ) = 0;
 
 // TAO_IDL - Generated from 
 // be/be_visitor_exception/exception_cs.cpp:63
@@ -1608,12 +1223,6 @@ RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::operator= (const :
   return *this;
 }
 
-void RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_any_destructor (void *_tao_void_pointer)
-{
-  INCOMPATIBLE_SCHEDULING_DISCIPLINES *tmp = ACE_static_cast (INCOMPATIBLE_SCHEDULING_DISCIPLINES*, _tao_void_pointer);
-  delete tmp;
-}
-
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -1721,6 +1330,75 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING
 ::CORBA::TypeCode_ptr RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
   &_tc_TAO_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 
+RTScheduling::Scheduler::Scheduler (void)
+{}
+
+RTScheduling::Scheduler::~Scheduler (void)
+{}
+
+RTScheduling::Scheduler_ptr
+RTScheduling::Scheduler::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  Scheduler_ptr proxy =
+    dynamic_cast<Scheduler_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
+}
+
+RTScheduling::Scheduler_ptr
+RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+RTScheduling::Scheduler::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:RTScheduling/Scheduler:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* RTScheduling::Scheduler::_interface_repository_id (void) const
+{
+  return "IDL:RTScheduling/Scheduler:1.0";
+}
+
+CORBA::Boolean
+RTScheduling::Scheduler::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1750,272 +1428,570 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler (
     sizeof (RTScheduling::Scheduler)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTScheduling)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Scheduler,
-    &_tc_TAO_tc_RTScheduling_Scheduler
-  )
-TAO_NAMESPACE_END
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_Scheduler =
+    &_tc_TAO_tc_RTScheduling_Scheduler;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_root/root.cpp:1703
 
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::ThreadAction_ptr _tao_elem
-  )
-{
-  RTScheduling::ThreadAction_ptr _tao_objptr =
-    RTScheduling::ThreadAction::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::ThreadAction_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTScheduling::ThreadAction>::insert (
-      _tao_any,
-      RTScheduling::ThreadAction::_tao_any_destructor,
-      RTScheduling::_tc_ThreadAction,
-      *_tao_elem
-    );
-}
+#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTScheduling::ThreadAction_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTScheduling::ThreadAction>::extract (
-        _tao_any,
-        RTScheduling::ThreadAction::_tao_any_destructor,
-        RTScheduling::_tc_ThreadAction,
-        _tao_elem
-      );
-}
+  template class TAO::Arg_Traits<CORBA::Policy>;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTScheduling::ThreadAction>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTScheduling::ThreadAction>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  template class
+    TAO::Object_Arg_Traits_T<
+        CORBA::Policy_ptr,
+        CORBA::Policy_var,
+        CORBA::Policy_out
+      >;
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+#endif /* end #if !defined */
 
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::DistributableThread_ptr _tao_elem
-  )
-{
-  RTScheduling::DistributableThread_ptr _tao_objptr =
-    RTScheduling::DistributableThread::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::DistributableThread_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTScheduling::DistributableThread>::insert (
-      _tao_any,
-      RTScheduling::DistributableThread::_tao_any_destructor,
-      RTScheduling::_tc_DistributableThread,
-      *_tao_elem
-    );
-}
+  template class TAO::Arg_Traits<CORBA::PolicyList>;
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTScheduling::DistributableThread_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTScheduling::DistributableThread>::extract (
-        _tao_any,
-        RTScheduling::DistributableThread::_tao_any_destructor,
-        RTScheduling::_tc_DistributableThread,
-        _tao_elem
-      );
-}
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::PolicyList,
+        CORBA::PolicyList_var,
+        CORBA::PolicyList_out
+      >;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTScheduling::DistributableThread>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTScheduling::DistributableThread>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
 
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::Current_ptr _tao_elem
-  )
-{
-  RTScheduling::Current_ptr _tao_objptr =
-    RTScheduling::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+  template class TAO::Arg_Traits<PortableInterceptor::ClientRequestInfo>;
 
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTScheduling::Current>::insert (
-      _tao_any,
-      RTScheduling::Current::_tao_any_destructor,
-      RTScheduling::_tc_Current,
-      *_tao_elem
-    );
-}
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableInterceptor::ClientRequestInfo_ptr,
+        PortableInterceptor::ClientRequestInfo_var,
+        PortableInterceptor::ClientRequestInfo_out
+      >;
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTScheduling::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTScheduling::Current>::extract (
-        _tao_any,
-        RTScheduling::Current::_tao_any_destructor,
-        RTScheduling::_tc_Current,
-        _tao_elem
-      );
-}
+#endif /* end #if !defined */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTScheduling::Current>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTScheduling::Current>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+  template class TAO::Arg_Traits<PortableInterceptor::ServerRequestInfo>;
 
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::ResourceManager_ptr _tao_elem
-  )
-{
-  RTScheduling::ResourceManager_ptr _tao_objptr =
-    RTScheduling::ResourceManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableInterceptor::ServerRequestInfo_ptr,
+        PortableInterceptor::ServerRequestInfo_var,
+        PortableInterceptor::ServerRequestInfo_out
+      >;
 
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::ResourceManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTScheduling::ResourceManager>::insert (
-      _tao_any,
-      RTScheduling::ResourceManager::_tao_any_destructor,
-      RTScheduling::_tc_ResourceManager,
-      *_tao_elem
-    );
-}
+#endif /* end #if !defined */
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTScheduling::ResourceManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTScheduling::ResourceManager>::extract (
-        _tao_any,
-        RTScheduling::ResourceManager::_tao_any_destructor,
-        RTScheduling::_tc_ResourceManager,
-        _tao_elem
-      );
-}
+#if !defined (_RTSCHEDULING_THREADACTION__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_THREADACTION__ARG_TRAITS_TMPLINST_CS_
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTScheduling::ResourceManager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTScheduling::ResourceManager>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  template class TAO::Arg_Traits<RTScheduling::ThreadAction>;
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTScheduling::ThreadAction_ptr,
+        RTScheduling::ThreadAction_var,
+        RTScheduling::ThreadAction_out
+      >;
 
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::Scheduler_ptr _tao_elem
-  )
-{
-  RTScheduling::Scheduler_ptr _tao_objptr =
-    RTScheduling::Scheduler::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+#endif /* end #if !defined */
 
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTScheduling::Scheduler_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTScheduling::Scheduler>::insert (
-      _tao_any,
-      RTScheduling::Scheduler::_tao_any_destructor,
-      RTScheduling::_tc_Scheduler,
-      *_tao_elem
-    );
-}
+  template class
+    TAO_Objref_Var_T<
+        RTScheduling::ThreadAction,
+        TAO::Objref_Traits<RTScheduling::ThreadAction>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTScheduling::ThreadAction,
+        TAO::Objref_Traits<RTScheduling::ThreadAction>
+      >;
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTScheduling::Scheduler_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTScheduling::Scheduler>::extract (
-        _tao_any,
-        RTScheduling::Scheduler::_tao_any_destructor,
-        RTScheduling::_tc_Scheduler,
-        _tao_elem
-      );
-}
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTScheduling::DistributableThread>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTScheduling::DistributableThread_ptr,
+        RTScheduling::DistributableThread_var,
+        RTScheduling::DistributableThread_out
+      >;
+
+#endif /* end #if !defined */
+
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_DT_STATE__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD_DT_STATE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTScheduling::DistributableThread::DT_State>;
+
+  template class TAO::Basic_Arg_Traits_T<RTScheduling::DistributableThread::DT_State>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTScheduling::DistributableThread,
+        TAO::Objref_Traits<RTScheduling::DistributableThread>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTScheduling::DistributableThread,
+        TAO::Objref_Traits<RTScheduling::DistributableThread>
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTScheduling::DistributableThread_ptr,
+        RTScheduling::DistributableThread_var
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        RTScheduling::ThreadAction_ptr
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        CORBA::Policy_ptr
+      >;
+
+#if !defined (_RTSCHEDULING_CURRENT_IDTYPE__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_CURRENT_IDTYPE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTScheduling::Current::IdType>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        RTScheduling::Current::IdType,
+        RTScheduling::Current::IdType_var,
+        RTScheduling::Current::IdType_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_FixedSeq_Var_T<
+        RTScheduling::Current::IdType,
+        CORBA::Octet
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        RTScheduling::Current::IdType,
+        CORBA::Octet
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        RTScheduling::Current::IdType,
+        RTScheduling::Current::IdType_var,
+        CORBA::Octet
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        RTScheduling::Current::IdType
+      >;
+
+#if !defined (_RTSCHEDULING_CURRENT_NAMELIST__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_CURRENT_NAMELIST__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTScheduling::Current::NameList>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        RTScheduling::Current::NameList,
+        RTScheduling::Current::NameList_var,
+        RTScheduling::Current::NameList_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_MngSeq_Var_T<
+        RTScheduling::Current::NameList,
+        TAO_SeqElem_String_Manager
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        RTScheduling::Current::NameList,
+        TAO_SeqElem_String_Manager
+      >;
+
+  template class
+    TAO_MngSeq_Out_T<
+        RTScheduling::Current::NameList,
+        RTScheduling::Current::NameList_var,
+        TAO_SeqElem_String_Manager
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTScheduling::Current,
+        TAO::Objref_Traits<RTScheduling::Current>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTScheduling::Current,
+        TAO::Objref_Traits<RTScheduling::Current>
+      >;
+
+#if !defined (_RTSCHEDULING_RESOURCEMANAGER__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_RESOURCEMANAGER__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<RTScheduling::ResourceManager>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        RTScheduling::ResourceManager_ptr,
+        RTScheduling::ResourceManager_var,
+        RTScheduling::ResourceManager_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        RTScheduling::ResourceManager,
+        TAO::Objref_Traits<RTScheduling::ResourceManager>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTScheduling::ResourceManager,
+        TAO::Objref_Traits<RTScheduling::ResourceManager>
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        RTScheduling::ResourceManager_ptr,
+        RTScheduling::ResourceManager_var
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        PortableInterceptor::ClientRequestInfo_ptr
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        PortableInterceptor::ServerRequestInfo_ptr
+      >;
+
+  template class
+    TAO::Out_Var_Size_Argument_T<
+        RTScheduling::Current::IdType,
+        RTScheduling::Current::IdType_out
+      >;
+
+  template class
+    TAO::Out_Object_Argument_T<
+        CORBA::Policy_ptr,
+        CORBA::Policy_out
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTScheduling::Scheduler,
+        TAO::Objref_Traits<RTScheduling::Scheduler>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTScheduling::Scheduler,
+        TAO::Objref_Traits<RTScheduling::Scheduler>
+      >;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<RTScheduling::Scheduler>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<RTScheduling::Scheduler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::Policy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        CORBA::Policy_ptr, \
+        CORBA::Policy_var, \
+        CORBA::Policy_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::PolicyList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::PolicyList, \
+        CORBA::PolicyList_var, \
+        CORBA::PolicyList_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ClientRequestInfo>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableInterceptor::ClientRequestInfo_ptr, \
+        PortableInterceptor::ClientRequestInfo_var, \
+        PortableInterceptor::ClientRequestInfo_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ServerRequestInfo>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableInterceptor::ServerRequestInfo_ptr, \
+        PortableInterceptor::ServerRequestInfo_var, \
+        PortableInterceptor::ServerRequestInfo_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_RTSCHEDULING_THREADACTION__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_THREADACTION__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTScheduling::ThreadAction>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTScheduling::ThreadAction_ptr, \
+        RTScheduling::ThreadAction_var, \
+        RTScheduling::ThreadAction_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTScheduling::ThreadAction, \
+        TAO::Objref_Traits<RTScheduling::ThreadAction> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTScheduling::ThreadAction, \
+        TAO::Objref_Traits<RTScheduling::ThreadAction> \
+      >
+
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTScheduling::DistributableThread>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTScheduling::DistributableThread_ptr, \
+        RTScheduling::DistributableThread_var, \
+        RTScheduling::DistributableThread_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_DT_STATE__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD_DT_STATE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTScheduling::DistributableThread::DT_State>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<RTScheduling::DistributableThread::DT_State>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTScheduling::DistributableThread, \
+        TAO::Objref_Traits<RTScheduling::DistributableThread> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTScheduling::DistributableThread, \
+        TAO::Objref_Traits<RTScheduling::DistributableThread> \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        RTScheduling::ThreadAction_ptr \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        CORBA::Policy_ptr \
+      >
+
+#if !defined (_RTSCHEDULING_CURRENT_IDTYPE__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_CURRENT_IDTYPE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTScheduling::Current::IdType>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        RTScheduling::Current::IdType, \
+        RTScheduling::Current::IdType_var, \
+        RTScheduling::Current::IdType_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_FixedSeq_Var_T< \
+        RTScheduling::Current::IdType, \
+        CORBA::Octet \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        RTScheduling::Current::IdType, \
+        CORBA::Octet \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        RTScheduling::Current::IdType, \
+        RTScheduling::Current::IdType_var, \
+        CORBA::Octet \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        RTScheduling::Current::IdType \
+      >
+
+#if !defined (_RTSCHEDULING_CURRENT_NAMELIST__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_CURRENT_NAMELIST__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTScheduling::Current::NameList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        RTScheduling::Current::NameList, \
+        RTScheduling::Current::NameList_var, \
+        RTScheduling::Current::NameList_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        RTScheduling::Current::NameList, \
+        TAO_SeqElem_String_Manager \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        RTScheduling::Current::NameList, \
+        TAO_SeqElem_String_Manager \
+      >
+
+# pragma instantiate \
+    TAO_MngSeq_Out_T< \
+        RTScheduling::Current::NameList, \
+        RTScheduling::Current::NameList_var, \
+        TAO_SeqElem_String_Manager \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTScheduling::Current, \
+        TAO::Objref_Traits<RTScheduling::Current> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTScheduling::Current, \
+        TAO::Objref_Traits<RTScheduling::Current> \
+      >
+
+#if !defined (_RTSCHEDULING_RESOURCEMANAGER__ARG_TRAITS_TMPLINST_CS_)
+#define _RTSCHEDULING_RESOURCEMANAGER__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<RTScheduling::ResourceManager>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        RTScheduling::ResourceManager_ptr, \
+        RTScheduling::ResourceManager_var, \
+        RTScheduling::ResourceManager_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTScheduling::ResourceManager, \
+        TAO::Objref_Traits<RTScheduling::ResourceManager> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTScheduling::ResourceManager, \
+        TAO::Objref_Traits<RTScheduling::ResourceManager> \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        PortableInterceptor::ClientRequestInfo_ptr \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        PortableInterceptor::ServerRequestInfo_ptr \
+      >
+
+# pragma instantiate \
+    TAO::Out_Var_Size_Argument_T< \
+        RTScheduling::Current::IdType, \
+        RTScheduling::Current::IdType_out \
+      >
+
+# pragma instantiate \
+    TAO::Out_Object_Argument_T< \
+        CORBA::Policy_ptr, \
+        CORBA::Policy_out \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTScheduling::Scheduler, \
+        TAO::Objref_Traits<RTScheduling::Scheduler> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTScheduling::Scheduler, \
+        TAO::Objref_Traits<RTScheduling::Scheduler> \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index cda6997860e..cd975933ce1 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -28,12 +28,12 @@
 // TAO_IDL - Generated from
 // be/be_codegen.cpp:151
 
-#ifndef _TAO_IDL_RTSCHEDULERC_H_
-#define _TAO_IDL_RTSCHEDULERC_H_
+#ifndef _TAO_IDL_ORIG_RTSCHEDULERC_H_
+#define _TAO_IDL_ORIG_RTSCHEDULERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/corba.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -41,15 +41,16 @@
 
 
 #include "rtscheduler_export.h"
+#include "tao/Sequence_T.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/VarOut_T.h"
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/PortableInterceptorC.h"
-
-#ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
-#error "You should not include RTSchedulerC.h directly, use RTScheduler.h"
-#endif /* !TAO_RTSCHEDULER_SAFE_INCLUDE */
-
+#include "tao/Object.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -75,33 +76,37 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be/be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  CORBA
+namespace TAO
 {
+  class Collocation_Proxy_Broker;
+}
 
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:48
+
+namespace CORBA
+{
   typedef void* VoidData;
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// be/be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module CORBA
+} // module CORBA
 
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:48
 
-TAO_NAMESPACE  RTScheduling
+namespace RTScheduling
 {
-
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTSCHEDULING_THREADACTION__ODDS_N_ENDS_CH_)
-#define _RTSCHEDULING_THREADACTION__ODDS_N_ENDS_CH_
+#if !defined (_RTSCHEDULING_THREADACTION__VAR_OUT_CH_)
+#define _RTSCHEDULING_THREADACTION__VAR_OUT_CH_
 
   class ThreadAction;
   typedef ThreadAction *ThreadAction_ptr;
-  struct tao_ThreadAction_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -115,30 +120,10 @@ TAO_NAMESPACE  RTScheduling
       >
     ThreadAction_out;
 
-  struct TAO_RTScheduler_Export tao_ThreadAction_life
-  {
-    static ThreadAction_ptr tao_duplicate (ThreadAction_ptr);
-    static void tao_release (ThreadAction_ptr);
-    static ThreadAction_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        ThreadAction_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTScheduler_Export tao_ThreadAction_cast
-  {
-    static ThreadAction_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_THREADACTION_CH_)
 #define _RTSCHEDULING_THREADACTION_CH_
@@ -149,7 +134,6 @@ TAO_NAMESPACE  RTScheduling
   public:
     typedef ThreadAction_ptr _ptr_type;
     typedef ThreadAction_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static ThreadAction_ptr _duplicate (ThreadAction_ptr obj);
@@ -159,17 +143,12 @@ TAO_NAMESPACE  RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static ThreadAction_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static ThreadAction_ptr _nil (void)
       {
         return (ThreadAction_ptr)0;
       }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
@@ -183,9 +162,12 @@ TAO_NAMESPACE  RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -207,14 +189,13 @@ TAO_NAMESPACE  RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadAction;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__ODDS_N_ENDS_CH_)
-#define _RTSCHEDULING_DISTRIBUTABLETHREAD__ODDS_N_ENDS_CH_
+#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_)
+#define _RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_
 
   class DistributableThread;
   typedef DistributableThread *DistributableThread_ptr;
-  struct tao_DistributableThread_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -228,30 +209,10 @@ TAO_NAMESPACE  RTScheduling
       >
     DistributableThread_out;
 
-  struct TAO_RTScheduler_Export tao_DistributableThread_life
-  {
-    static DistributableThread_ptr tao_duplicate (DistributableThread_ptr);
-    static void tao_release (DistributableThread_ptr);
-    static DistributableThread_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        DistributableThread_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTScheduler_Export tao_DistributableThread_cast
-  {
-    static DistributableThread_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_CH_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD_CH_
@@ -262,7 +223,6 @@ TAO_NAMESPACE  RTScheduling
   public:
     typedef DistributableThread_ptr _ptr_type;
     typedef DistributableThread_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static DistributableThread_ptr _duplicate (DistributableThread_ptr obj);
@@ -272,17 +232,12 @@ TAO_NAMESPACE  RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static DistributableThread_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static DistributableThread_ptr _nil (void)
       {
         return (DistributableThread_ptr)0;
       }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be/be_visitor_enum/enum_ch.cpp:57
@@ -321,9 +276,12 @@ TAO_NAMESPACE  RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -345,14 +303,13 @@ TAO_NAMESPACE  RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DistributableThread;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTSCHEDULING_CURRENT__ODDS_N_ENDS_CH_)
-#define _RTSCHEDULING_CURRENT__ODDS_N_ENDS_CH_
+#if !defined (_RTSCHEDULING_CURRENT__VAR_OUT_CH_)
+#define _RTSCHEDULING_CURRENT__VAR_OUT_CH_
 
   class Current;
   typedef Current *Current_ptr;
-  struct tao_Current_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -366,79 +323,10 @@ TAO_NAMESPACE  RTScheduling
       >
     Current_out;
 
-  struct TAO_RTScheduler_Export tao_Current_life
-  {
-    static Current_ptr tao_duplicate (Current_ptr);
-    static void tao_release (Current_ptr);
-    static Current_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        Current_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTScheduler_Export tao_Current_cast
-  {
-    static Current_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
-
-  /*
-#if !defined (_RTSCHEDULING_CURRENT___VAR_CH_)
-#define _RTSCHEDULING_CURRENT___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // C:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-
-
-  class TAO_RTScheduler_Export Current_var : public TAO_Base_var
-  {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static Current_ptr tao_duplicate (Current_ptr);
-    static void tao_release (Current_ptr);
-    static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    Current_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Current_var (const TAO_Base_var &rhs);
-    Current_var &operator= (const TAO_Base_var &rhs);
-  };
-
-  #endif */ /* end #if !defined */
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_CURRENT_CH_)
 #define _RTSCHEDULING_CURRENT_CH_
@@ -449,7 +337,6 @@ TAO_NAMESPACE  RTScheduling
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
@@ -459,17 +346,12 @@ TAO_NAMESPACE  RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
@@ -504,8 +386,6 @@ TAO_NAMESPACE  RTScheduling
 
       UNSUPPORTED_SCHEDULING_DISCIPLINE &operator= (const UNSUPPORTED_SCHEDULING_DISCIPLINE &);
 
-      static void _tao_any_destructor (void *);
-
       static UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -515,12 +395,12 @@ TAO_NAMESPACE  RTScheduling
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -576,7 +456,7 @@ TAO_NAMESPACE  RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:91
+    // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CH_)
 #define _RTSCHEDULING_CURRENT_IDTYPE_CH_
@@ -616,8 +496,6 @@ TAO_NAMESPACE  RTScheduling
       IdType (const IdType &);
       ~IdType (void);
 
-      static void _tao_any_destructor (void *);
-
       typedef IdType_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -678,7 +556,7 @@ TAO_NAMESPACE  RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:91
+    // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CH_)
 #define _RTSCHEDULING_CURRENT_NAMELIST_CH_
@@ -716,8 +594,6 @@ TAO_NAMESPACE  RTScheduling
       NameList (const NameList &);
       ~NameList (void);
 
-      static void _tao_any_destructor (void *);
-
       typedef NameList_var _var_type;
     };
 
@@ -739,9 +615,12 @@ TAO_NAMESPACE  RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -763,14 +642,13 @@ TAO_NAMESPACE  RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTSCHEDULING_RESOURCEMANAGER__ODDS_N_ENDS_CH_)
-#define _RTSCHEDULING_RESOURCEMANAGER__ODDS_N_ENDS_CH_
+#if !defined (_RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_)
+#define _RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_
 
   class ResourceManager;
   typedef ResourceManager *ResourceManager_ptr;
-  struct tao_ResourceManager_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -784,30 +662,10 @@ TAO_NAMESPACE  RTScheduling
       >
     ResourceManager_out;
 
-  struct TAO_RTScheduler_Export tao_ResourceManager_life
-  {
-    static ResourceManager_ptr tao_duplicate (ResourceManager_ptr);
-    static void tao_release (ResourceManager_ptr);
-    static ResourceManager_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        ResourceManager_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTScheduler_Export tao_ResourceManager_cast
-  {
-    static ResourceManager_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER_CH_)
 #define _RTSCHEDULING_RESOURCEMANAGER_CH_
@@ -818,7 +676,6 @@ TAO_NAMESPACE  RTScheduling
   public:
     typedef ResourceManager_ptr _ptr_type;
     typedef ResourceManager_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static ResourceManager_ptr _duplicate (ResourceManager_ptr obj);
@@ -828,22 +685,20 @@ TAO_NAMESPACE  RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static ResourceManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static ResourceManager_ptr _nil (void)
       {
         return (ResourceManager_ptr)0;
       }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -865,14 +720,13 @@ TAO_NAMESPACE  RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ResourceManager;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+  // be/be_interface.cpp:601
 
-#if !defined (_RTSCHEDULING_SCHEDULER__ODDS_N_ENDS_CH_)
-#define _RTSCHEDULING_SCHEDULER__ODDS_N_ENDS_CH_
+#if !defined (_RTSCHEDULING_SCHEDULER__VAR_OUT_CH_)
+#define _RTSCHEDULING_SCHEDULER__VAR_OUT_CH_
 
   class Scheduler;
   typedef Scheduler *Scheduler_ptr;
-  struct tao_Scheduler_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -886,30 +740,10 @@ TAO_NAMESPACE  RTScheduling
       >
     Scheduler_out;
 
-  struct TAO_RTScheduler_Export tao_Scheduler_life
-  {
-    static Scheduler_ptr tao_duplicate (Scheduler_ptr);
-    static void tao_release (Scheduler_ptr);
-    static Scheduler_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        Scheduler_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_RTScheduler_Export tao_Scheduler_cast
-  {
-    static Scheduler_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_SCHEDULER_CH_)
 #define _RTSCHEDULING_SCHEDULER_CH_
@@ -920,7 +754,6 @@ TAO_NAMESPACE  RTScheduling
   public:
     typedef Scheduler_ptr _ptr_type;
     typedef Scheduler_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static Scheduler_ptr _duplicate (Scheduler_ptr obj);
@@ -930,17 +763,12 @@ TAO_NAMESPACE  RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static Scheduler_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static Scheduler_ptr _nil (void)
       {
         return (Scheduler_ptr)0;
       }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:51
@@ -958,8 +786,6 @@ TAO_NAMESPACE  RTScheduling
 
       INCOMPATIBLE_SCHEDULING_DISCIPLINES &operator= (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &);
 
-      static void _tao_any_destructor (void *);
-
       static INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -969,12 +795,12 @@ TAO_NAMESPACE  RTScheduling
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -1236,9 +1062,12 @@ TAO_NAMESPACE  RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    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);
@@ -1260,83 +1089,17 @@ TAO_NAMESPACE  RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Scheduler;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
-
-}
-TAO_NAMESPACE_CLOSE // module RTScheduling
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::ThreadAction_ptr); // copying
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::ThreadAction_ptr *); // non-copying
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::ThreadAction_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::DistributableThread_ptr); // copying
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::DistributableThread_ptr *); // non-copying
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::DistributableThread_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::DistributableThread::DT_State);
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::DistributableThread::DT_State &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_module/module_ch.cpp:66
 
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Current_ptr); // copying
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Current_ptr *); // non-copying
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::Current_ptr &);
+} // module RTScheduling
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_traits.cpp:48
 
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, const RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE &); // copying version
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE*); // noncopying version
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *&); // deprecated
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, const RTScheduling::Current::IdType &); // copying version
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Current::IdType*); // noncopying version
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::Current::IdType *&); // deprecated
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTScheduling::Current::IdType *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, const RTScheduling::Current::NameList &); // copying version
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Current::NameList*); // noncopying version
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::Current::NameList *&); // deprecated
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTScheduling::Current::NameList *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::ResourceManager_ptr); // copying
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::ResourceManager_ptr *); // non-copying
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::ResourceManager_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Scheduler_ptr); // copying
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Scheduler_ptr *); // non-copying
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::Scheduler_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
-
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, const RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES &); // copying version
-TAO_RTScheduler_Export void operator<<= (CORBA::Any &, RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES*); // noncopying version
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *&); // deprecated
-TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *&);
+// Traits specializations.
+namespace TAO
+{
+};
 
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
@@ -1349,7 +1112,7 @@ TAO_RTScheduler_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTS
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1018
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "RTSchedulerC.i"
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.i b/TAO/tao/RTScheduling/RTSchedulerC.i
index 1c8d5255dab..878abfc44b9 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.i
+++ b/TAO/tao/RTScheduling/RTSchedulerC.i
@@ -32,33 +32,6 @@
 #if !defined (_RTSCHEDULING_THREADACTION___CI_)
 #define _RTSCHEDULING_THREADACTION___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::ThreadAction>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::ThreadAction>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::ThreadAction>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -67,84 +40,14 @@ TAO::Any_Impl_T<RTScheduling::ThreadAction>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD___CI_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::DistributableThread>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::DistributableThread>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::DistributableThread>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTSCHEDULING_CURRENT___CI_)
 #define _RTSCHEDULING_CURRENT___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::Current>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::Current>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::Current>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -153,83 +56,13 @@ TAO::Any_Impl_T<RTScheduling::Current>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER___CI_)
 #define _RTSCHEDULING_RESOURCEMANAGER___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::ResourceManager>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::ResourceManager>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::ResourceManager>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_RTSCHEDULING_SCHEDULER___CI_)
 #define _RTSCHEDULING_SCHEDULER___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::Scheduler>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::Scheduler>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<RTScheduling::Scheduler>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index ef4f894f507..7fdbb95aa61 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -22,7 +22,7 @@
 #endif /* _MSC_VER */
 
 #include "RTScheduler.h"
-//#include "tao/LocalObject.h"
+#include "tao/LocalObject.h"
 
 class TAO_RTScheduler_Manager;
 class TAO_RTScheduler_Manager_var;
@@ -41,7 +41,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager :
 {
 public:
 
-	TAO_RTScheduler_Manager (void);
+        TAO_RTScheduler_Manager (void);
   /// Constructor.
   TAO_RTScheduler_Manager (TAO_ORB_Core*);
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
index 4d2705ab82e..5e17d199dde 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
@@ -25,10 +25,10 @@
 //   declared in it as CORBA_foo, unalias the simple typedefs
 //   which don't have a CORBA_ analog in corbafwd.h.
 //
-//   2. Generate the code. The command used to generate code from this 
+//   2. Generate the code. The command used to generate code from this
 //   IDL file is:
 //
-//     tao_idl -o orig -Ge 1 -I../.. -ci "C.inl" \
+//     tao_idl -o orig -Ge 1 -GT -I../.. -ci "C.inl" \
 //          -Wb,export_macro=TAO_TypeCodeFactory_Export \
 //          -Wb,export_include=typecodefactory_export.h \
 //          -Wb,pre_include="ace/pre.h" \
@@ -38,7 +38,7 @@
 //   3. Copy the generated files to the current directory.
 //
 //   4. Patch the generated files, using
-//      
+//
 //      patch < diffs/TypeCodeFactoryC.h.diff
 //      patch < diffs/TypeCodeFactoryC.i.diff
 //      patch < diffs/TypeCodeFactoryC.cpp.diff
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index c45b6fe23a5..b1dce78d5be 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -15,25 +15,32 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+// be/be_codegen.cpp:301
 
 
-#include "TypeCodeFactoryC.h"
+#include "TypeCodeFactory_Loader.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -44,12 +51,96 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// be/be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_STRUCTMEMBER___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_STRUCTMEMBER___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::StructMemberSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::StructMemberSeq,
+            CORBA::StructMemberSeq_var,
+            CORBA::StructMemberSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_UNIONMEMBER___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_UNIONMEMBER___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::UnionMemberSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::UnionMemberSeq,
+            CORBA::UnionMemberSeq_var,
+            CORBA::UnionMemberSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_IDENTIFIER___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_IDENTIFIER___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::EnumMemberSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::EnumMemberSeq,
+            CORBA::EnumMemberSeq_var,
+            CORBA::EnumMemberSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_VALUEMEMBER___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_VALUEMEMBER___ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueMemberSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::ValueMemberSeq,
+            CORBA::ValueMemberSeq_var,
+            CORBA::ValueMemberSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int CORBA::TypeCodeFactory::_tao_class_id = 0;
+// Traits specializations for CORBA::TypeCodeFactory.
 
 CORBA::TypeCodeFactory_ptr
-CORBA::tao_TypeCodeFactory_life::tao_duplicate (
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_duplicate (
     CORBA::TypeCodeFactory_ptr p
   )
 {
@@ -57,7 +148,7 @@ CORBA::tao_TypeCodeFactory_life::tao_duplicate (
 }
 
 void
-CORBA::tao_TypeCodeFactory_life::tao_release (
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_release (
     CORBA::TypeCodeFactory_ptr p
   )
 {
@@ -65,67 +156,25 @@ CORBA::tao_TypeCodeFactory_life::tao_release (
 }
 
 CORBA::TypeCodeFactory_ptr
-CORBA::tao_TypeCodeFactory_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_nil (void)
 {
   return CORBA::TypeCodeFactory::_nil ();
 }
 
 CORBA::Boolean
-CORBA::tao_TypeCodeFactory_life::tao_marshal (
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_marshal (
     CORBA::TypeCodeFactory_ptr p,
-    TAO_OutputCDR &cdr
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-CORBA::TypeCodeFactory_ptr
-CORBA::tao_TypeCodeFactory_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::TypeCodeFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-CORBA::tao_TypeCodeFactory_cast::tao_upcast (
-    void *src
-  )
-{
-  CORBA::TypeCodeFactory **tmp =
-    ACE_static_cast (CORBA::TypeCodeFactory **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        CORBA::TypeCodeFactory,
-        CORBA::tao_TypeCodeFactory_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        CORBA::TypeCodeFactory,
-        CORBA::tao_TypeCodeFactory_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        CORBA::TypeCodeFactory, \
-        CORBA::tao_TypeCodeFactory_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        CORBA::TypeCodeFactory, \
-        CORBA::tao_TypeCodeFactory_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker *
+(*CORBA__TAO_TypeCodeFactory_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 CORBA::TypeCodeFactory::TypeCodeFactory (void)
 {}
@@ -136,40 +185,21 @@ CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 void
 CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
-  TypeCodeFactory *tmp = ACE_static_cast (TypeCodeFactory *, _tao_void_pointer);
-  CORBA::release (tmp);
+  TypeCodeFactory *_tao_tmp_pointer =
+    ACE_static_cast (TypeCodeFactory *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::TypeCodeFactory_ptr
 CORBA::TypeCodeFactory::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return TypeCodeFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return TypeCodeFactory::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          TypeCodeFactory_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &TypeCodeFactory::_tao_class_id
-                )
-            )
-        );
+  TypeCodeFactory_ptr proxy =
+    dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 CORBA::TypeCodeFactory_ptr
@@ -183,35 +213,33 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
   return obj;
 }
 
-void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+CORBA::TypeCodeFactory::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::CORBA, TypeCodeFactory)::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/TypeCodeFactory:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv = ACE_reinterpret_cast (void*, this);
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  else
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 0;
     }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
 }
 
 const char* CORBA::TypeCodeFactory::_interface_repository_id (void) const
@@ -226,7 +254,7 @@ CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_TypeCodeFactory[] =
 {
@@ -257,17 +285,14 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeCodeFactory (
     sizeof (CORBA::TypeCodeFactory)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_TypeCodeFactory,
-    &_tc_TAO_tc_CORBA_TypeCodeFactory
-  )
-TAO_NAMESPACE_END
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_TypeCodeFactory =
+    &_tc_TAO_tc_CORBA_TypeCodeFactory;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -311,11 +336,321 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-template class TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var,CORBA::tao_TypeCodeFactory_life>;
-template class TAO::Any_Impl_T<CORBA::TypeCodeFactory>;
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypeCodeFactory>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::SetOverrideType
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::PolicyError
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::InvalidPolicies
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::TCKind
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::exception_type
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::ParameterMode
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::DefinitionKind
+      >;
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::ValueMemberSeq>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::ValueMemberSeq,
+        CORBA::ValueMemberSeq_var,
+        CORBA::ValueMemberSeq_out
+      >;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::StructMemberSeq>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::StructMemberSeq,
+        CORBA::StructMemberSeq_var,
+        CORBA::StructMemberSeq_out
+      >;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::UnionMemberSeq>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::UnionMemberSeq,
+        CORBA::UnionMemberSeq_var,
+        CORBA::UnionMemberSeq_out
+      >;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::EnumMemberSeq>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::EnumMemberSeq,
+        CORBA::EnumMemberSeq_var,
+        CORBA::EnumMemberSeq_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::PrimitiveKind
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::AttributeMode
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::OperationMode
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        CORBA::TypeCodeFactory,
+        TAO::Objref_Traits<CORBA::TypeCodeFactory>
+      >;
+
+  template class
+    TAO_Objref_Out_T<
+        CORBA::TypeCodeFactory,
+        TAO::Objref_Traits<CORBA::TypeCodeFactory>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        CORBA::TypeCodeFactory
+      >;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory, CORBA::TypeCodeFactory_var,CORBA::tao_TypeCodeFactory_life>
-# pragma instantiate TAO::Any_Impl_T<CORBA::TypeCodeFactory>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::SetOverrideType \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::PolicyError \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::InvalidPolicies \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::TCKind \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::exception_type \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::ParameterMode \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::DefinitionKind \
+      >
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::ValueMemberSeq>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::ValueMemberSeq, \
+        CORBA::ValueMemberSeq_var, \
+        CORBA::ValueMemberSeq_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::StructMemberSeq>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::StructMemberSeq, \
+        CORBA::StructMemberSeq_var, \
+        CORBA::StructMemberSeq_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::UnionMemberSeq>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::UnionMemberSeq, \
+        CORBA::UnionMemberSeq_var, \
+        CORBA::UnionMemberSeq_out \
+      >
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::EnumMemberSeq>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::EnumMemberSeq, \
+        CORBA::EnumMemberSeq_var, \
+        CORBA::EnumMemberSeq_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::PrimitiveKind \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::AttributeMode \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::OperationMode \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::TypeCodeFactory, \
+        TAO::Objref_Traits<CORBA::TypeCodeFactory> \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::TypeCodeFactory, \
+        TAO::Objref_Traits<CORBA::TypeCodeFactory> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        CORBA::TypeCodeFactory \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 8f4095ad795..e419ea83a69 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -15,25 +15,43 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
-#ifndef _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
-#define _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
+#ifndef _TAO_IDL_TYPECODEFACTORYC_H_
+#define _TAO_IDL_TYPECODEFACTORYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IFR_Client/IFR_ExtendedC.h"
+#include "tao/corbafwd.h"
+
+#ifndef TAO_TYPECODEFACTORY_SAFE_INCLUDE
+#error "You should not include TypeCodeFactoryC.h directly, use TypeCodeFactory_Loader.h"
+#endif /* !TAO_TYPECODEFACTORY_SAFE_INCLUDE */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #include "typecodefactory_export.h"
+#include "tao/Sequence_T.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/VarOut_T.h"
+
+#include "tao/IFR_Client/IFR_ExtendedC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -59,94 +77,73 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_root/root_ch.cpp:63
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:48
 
-TAO_NAMESPACE  CORBA
+namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // be/be_interface.cpp:601
+
+#if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_)
+#define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_
 
-#if !defined (_CORBA_TYPECODEFACTORY__ODDS_N_ENDS_CH_)
-#define _CORBA_TYPECODEFACTORY__ODDS_N_ENDS_CH_
-  
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-  struct tao_TypeCodeFactory_life;
-  
+
   typedef
     TAO_Objref_Var_T<
-        TypeCodeFactory,
-        tao_TypeCodeFactory_life
+        TypeCodeFactory
       >
     TypeCodeFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
-        TypeCodeFactory,
-        tao_TypeCodeFactory_life
+        TypeCodeFactory
       >
     TypeCodeFactory_out;
-  
-  struct TAO_TypeCodeFactory_Export tao_TypeCodeFactory_life
-  {
-    static TypeCodeFactory_ptr tao_duplicate (TypeCodeFactory_ptr);
-    static void tao_release (TypeCodeFactory_ptr);
-    static TypeCodeFactory_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        TypeCodeFactory_ptr,
-        TAO_OutputCDR &
-      );
-  };
-  
-  struct TAO_TypeCodeFactory_Export tao_TypeCodeFactory_cast
-  {
-    static TypeCodeFactory_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
-  
+
   class TAO_TypeCodeFactory_Export TypeCodeFactory
     : public virtual CORBA::Object
   {
   public:
     typedef TypeCodeFactory_ptr _ptr_type;
     typedef TypeCodeFactory_var _var_type;
-    static int _tao_class_id;
-    
+
     // The static operations.
     static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-    
+
     static TypeCodeFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
-    static TypeCodeFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
+
     static TypeCodeFactory_ptr _nil (void)
       {
         return (TypeCodeFactory_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
@@ -156,10 +153,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
@@ -170,10 +167,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
@@ -183,10 +180,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
@@ -196,10 +193,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
@@ -209,10 +206,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name
@@ -221,10 +218,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -232,10 +229,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_wstring_tc (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -243,10 +240,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
         CORBA::UShort scale
@@ -255,10 +252,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
         CORBA::TypeCode_ptr element_type
@@ -267,10 +264,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
         CORBA::TypeCode_ptr element_type
@@ -279,10 +276,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
@@ -294,10 +291,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
@@ -307,10 +304,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name
@@ -319,10 +316,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_recursive_tc (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -330,10 +327,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name
@@ -342,10 +339,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_local_interface_tc (
         const char * id,
         const char * name
@@ -354,10 +351,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name
@@ -366,10 +363,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name
@@ -378,10 +375,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::TypeCode_ptr create_event_tc (
         const char * id,
         const char * name,
@@ -393,56 +390,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-    
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-    
+    // be/be_visitor_interface/interface_ch.cpp:185
+
+    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:
     TypeCodeFactory (void);
     virtual ~TypeCodeFactory (void);
-  
+
   private:
     TypeCodeFactory (const TypeCodeFactory &);
     void operator= (const TypeCodeFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+// be/be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module CORBA
+} // module CORBA
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_traits.cpp:48
+
+// Traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactory_ptr); // copying
 TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactory_ptr *); // non-copying
 TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeCodeFactory_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "TypeCodeFactoryC.inl"
@@ -458,4 +465,3 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index b9d173d03a1..1982171b632 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -15,42 +15,22 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_CORBA_TYPECODEFACTORY___CI_)
 #define _CORBA_TYPECODEFACTORY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::TypeCodeFactory>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
+