ChangeLogTag: Mon Feb 7 13:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

40 files changed, 3204 insertions, 3243 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2479724f834..8ae0ec76ff3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,33 @@
+Mon Feb  7 13:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/Connection_Timeout_Policy_i.h:
+        * tao/Messaging/Messaging_ORBInitializer.h:
+        * tao/Messaging/Messaging_Policy_i.h:
+        * tao/Messaging/Messaging_PolicyFactory.h:
+          Simplified msc_ver checks
+
+        * tao/Messaging/Messaging.pidl:
+        * tao/Messaging/Messaging_No_Impl.pidl:
+        * tao/Messaging/Messaging_RT_Policy.pidl:
+        * tao/Messaging/Messaging_SyncScope_Policy.pidl:
+        * tao/Messaging/TAO_Ext.pidl:
+          Updated regeneration instructions
+
+        * tao/Messaging/diffs/Messaging.diff:
+        * tao/Messaging/diffs/Messaging_No_Impl.diff:
+          Updated
+
+        * tao/Messaging/Messaging_No_Impl{A,C}.{h,cpp,i,inl}:
+        * tao/Messaging/Messaging_RT_Policy{A,C}.{h,cpp,i,inl}:
+        * tao/Messaging/Messaging_SyncScopy_Policy{A,C}.{h,cpp,i,inl}:
+        * tao/Messaging/Messaging{A,C,S,S_T}.{h,cpp,i,inl}:
+        * tao/Messaging/TAO_Ext{A,C}.{h,cpp,i,inl}:
+          Regenerated all these files, added new A.cpp files and replaced .i
+          with .inl files.
+
+        * tao/Makefile.am:
+          Updated for changes above
+
 Mon Feb  7 10:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/DynamicAny/DynamicAnyC.cpp:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 63cdb55a12f..ced53950c3d 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1324,14 +1324,19 @@ libTAO_Messaging_la_SOURCES = \
   Messaging/Asynch_Timeout_Handler.cpp \
   Messaging/Connection_Timeout_Policy_i.cpp \
   Messaging/Messaging.cpp \
+  Messaging/MessagingA.cpp \
   Messaging/MessagingC.cpp \
   Messaging/MessagingS.cpp \
+  Messaging/Messaging_No_ImplA.cpp \
   Messaging/Messaging_No_ImplC.cpp \
   Messaging/Messaging_ORBInitializer.cpp \
   Messaging/Messaging_PolicyFactory.cpp \
   Messaging/Messaging_Policy_i.cpp \
+  Messaging/Messaging_RT_PolicyA.cpp \
   Messaging/Messaging_RT_PolicyC.cpp \
+  Messaging/Messaging_SyncScope_PolicyA.cpp \
   Messaging/Messaging_SyncScope_PolicyC.cpp \
+  Messaging/TAO_ExtA.cpp \
   Messaging/TAO_ExtC.cpp
 
 libTAO_Messaging_la_LDFLAGS = \
@@ -1354,28 +1359,28 @@ nobase_include_HEADERS += \
   Messaging/Messaging.h \
   Messaging/Messaging.pidl \
   Messaging/MessagingC.h \
-  Messaging/MessagingC.i \
+  Messaging/MessagingC.inl \
   Messaging/MessagingS.h \
-  Messaging/MessagingS.i \
+  Messaging/MessagingS.inl \
   Messaging/MessagingS_T.cpp \
   Messaging/MessagingS_T.h \
-  Messaging/MessagingS_T.i \
+  Messaging/MessagingS_T.inl \
   Messaging/Messaging_No_Impl.pidl \
   Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplC.i \
+  Messaging/Messaging_No_ImplC.inl \
   Messaging/Messaging_ORBInitializer.h \
   Messaging/Messaging_PolicyFactory.h \
   Messaging/Messaging_Policy_i.h \
   Messaging/Messaging_Policy_i.i \
   Messaging/Messaging_RT_Policy.pidl \
   Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyC.i \
+  Messaging/Messaging_RT_PolicyC.inl \
   Messaging/Messaging_SyncScope_Policy.pidl \
   Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyC.i \
+  Messaging/Messaging_SyncScope_PolicyC.inl \
   Messaging/TAO_Ext.pidl \
   Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtC.i \
+  Messaging/TAO_ExtC.inl \
   Messaging/messaging_export.h
 
 pkgconfigdata_DATA += TAO_Messaging.pc
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index eaacb08e57d..73f041dca16 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -23,9 +23,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -93,7 +91,7 @@ private:
 
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index db86e054c7d..5bcfade5803 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -20,14 +20,14 @@
  *
  * after the file is generated a patch must be applied:
  *
- *   cp orig/Messaging{C,S,S_T}.{h,i,cpp} .
+ *   cp orig/Messaging{A,C,S,S_T}.{h,inl,cpp} .
  *   patch < diffs/Messaging.diff
  *
  * The patch eliminates cycles in the include dependencies.
  *
  * Note: to update the patch file after re-generating the code use:
  *
- *   for i in Messaging{C,S,S_T}.{h,i,cpp}; do
+ *   for i in Messaging{A,C,S,S_T}.{h,inl,cpp}; do
  *     diff -uBbw orig/$i $i;
  *   done > diffs/Messaging.diff
  */
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
new file mode 100644
index 00000000000..cadc3e92d62
--- /dev/null
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -0,0 +1,300 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "Messaging.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f4578),
+  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x696f6e48),
+  ACE_NTOHL (0x6f6c6465),
+  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
+    16,
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e486f6c),
+  ACE_NTOHL (0x64657200),  // name = ExceptionHolder
+    0, // value modifier
+  CORBA::tk_null, // no stateful base valuetype
+
+3, // member count
+    20,
+  ACE_NTOHL (0x69735f73),
+  ACE_NTOHL (0x79737465),
+  ACE_NTOHL (0x6d5f6578),
+  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x696f6e00),  // name = is_system_exception
+    CORBA::tk_boolean,
+
+  1, // data member visibility marker
+
+  11,
+  ACE_NTOHL (0x62797465),
+  ACE_NTOHL (0x5f6f7264),
+  ACE_NTOHL (0x65720000),  // name = byte_order
+    CORBA::tk_boolean,
+
+  1, // data member visibility marker
+
+  20,
+  ACE_NTOHL (0x6d617273),
+  ACE_NTOHL (0x68616c65),
+  ACE_NTOHL (0x645f6578),
+  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f63),
+    ACE_NTOHL (0x74657453),
+    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+        9,
+    ACE_NTOHL (0x4f637465),
+    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_octet,
+
+      0U,
+
+
+  1, // data member visibility marker
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (
+    CORBA::tk_value,
+    sizeof (_oc_Messaging_ExceptionHolder),
+    (char *) &_oc_Messaging_ExceptionHolder,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_ExceptionHolder =
+    &_tc_TAO_tc_Messaging_ExceptionHolder;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_ReplyHandler[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x706c7948),
+  ACE_NTOHL (0x616e646c),
+  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
+    13,
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x7948616e),
+  ACE_NTOHL (0x646c6572),
+  ACE_NTOHL (0x0),  // name = ReplyHandler
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_ReplyHandler),
+    (char *) &_oc_Messaging_ReplyHandler,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_ReplyHandler =
+    &_tc_TAO_tc_Messaging_ReplyHandler;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
+}
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *_tao_elem
+  )
+{
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder **_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
+      _tao_any,
+      Messaging::ExceptionHolder::_tao_any_destructor,
+      Messaging::_tc_ExceptionHolder,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
+        _tao_any,
+        Messaging::ExceptionHolder::_tao_any_destructor,
+        Messaging::_tc_ExceptionHolder,
+        _tao_elem
+      );
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyHandler_ptr _tao_elem
+  )
+{
+  Messaging::ReplyHandler_ptr _tao_objptr =
+    Messaging::ReplyHandler::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyHandler_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ReplyHandler>::insert (
+      _tao_any,
+      Messaging::ReplyHandler::_tao_any_destructor,
+      Messaging::_tc_ReplyHandler,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::ReplyHandler_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ReplyHandler>::extract (
+        _tao_any,
+        Messaging::ReplyHandler::_tao_any_destructor,
+        Messaging::_tc_ReplyHandler,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::ExceptionHolder
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::ReplyHandler
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::ExceptionHolder \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::ReplyHandler \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 2c7af6e248c..cb7a5b22039 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -26,15 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging.h"
-#include "tao/Any.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -42,11 +40,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingC.i"
+#include "MessagingC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -55,120 +53,27 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e48),
-  ACE_NTOHL (0x6f6c6465),
-  ACE_NTOHL (0x723a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
-    16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e486f6c),
-  ACE_NTOHL (0x64657200),  // name = ExceptionHolder
-    0, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
-    20,
-  ACE_NTOHL (0x69735f73),
-  ACE_NTOHL (0x79737465),
-  ACE_NTOHL (0x6d5f6578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e00),  // name = is_system_exception
-    CORBA::tk_boolean,
-
-  1, // data member visibility marker
-
-  11,
-  ACE_NTOHL (0x62797465),
-  ACE_NTOHL (0x5f6f7264),
-  ACE_NTOHL (0x65720000),  // name = byte_order
-    CORBA::tk_boolean,
-
-  1, // data member visibility marker
-
-  20,
-  ACE_NTOHL (0x6d617273),
-  ACE_NTOHL (0x68616c65),
-  ACE_NTOHL (0x645f6578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-  1, // data member visibility marker
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (
-    CORBA::tk_value,
-    sizeof (_oc_Messaging_ExceptionHolder),
-    (char *) &_oc_Messaging_ExceptionHolder,
-    0,
-    sizeof (Messaging::ExceptionHolder)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ExceptionHolder =
-    &_tc_TAO_tc_Messaging_ExceptionHolder;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref (
+TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref (
     Messaging::ExceptionHolder * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref (
+TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref (
     Messaging::ExceptionHolder * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<Messaging::ExceptionHolder>::release (
     Messaging::ExceptionHolder * p
@@ -180,11 +85,6 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::release (
 Messaging::ExceptionHolder *
 Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
 }
 
@@ -198,8 +98,8 @@ void
 Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionHolder *_tao_tmp_pointer =
-    ACE_static_cast (
-        ExceptionHolder *,
+    static_cast<
+        ExceptionHolder *> (
         _tao_void_pointer
       );
   CORBA::remove_ref (_tao_tmp_pointer);
@@ -229,29 +129,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
@@ -269,20 +169,26 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char*
+Messaging::ExceptionHolder_init *
+Messaging::ExceptionHolder_init::_downcast (CORBA::ValueFactoryBase *v)
+{
+  return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
+}
+
+const char* 
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
 }
 
 CORBA::ValueBase *
-Messaging::ExceptionHolder_init::create_for_unmarshal (void)
+Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ValueBase *ret_val = 0;
-  ACE_NEW_RETURN (
+  ACE_NEW_THROW_EX (
       ret_val,
       OBV_Messaging::ExceptionHolder,
-      0
+      CORBA::NO_MEMORY ()
     );
   return ret_val;
 }
@@ -328,7 +234,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -352,11 +258,11 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void
+void 
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *_tao_tmp_pointer =
-    ACE_static_cast (ReplyHandler *, _tao_void_pointer);
+    static_cast<ReplyHandler *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -397,7 +303,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -409,14 +315,14 @@ Messaging::ReplyHandler::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyHandler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -441,44 +347,6 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyHandler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5265),
-  ACE_NTOHL (0x706c7948),
-  ACE_NTOHL (0x616e646c),
-  ACE_NTOHL (0x65723a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
-    13,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x7948616e),
-  ACE_NTOHL (0x646c6572),
-  ACE_NTOHL (0x0),  // name = ReplyHandler
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyHandler),
-    (char *) &_oc_Messaging_ReplyHandler,
-    0,
-    sizeof (Messaging::ReplyHandler)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyHandler =
-    &_tc_TAO_tc_Messaging_ReplyHandler;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
 
 OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
@@ -500,7 +368,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_I
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:567
+// be\be_visitor_valuetype/field_cs.cpp:568
 
 // Accessor to set the member.
 void
@@ -518,7 +386,7 @@ OBV_Messaging::ExceptionHolder::is_system_exception (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:567
+// be\be_visitor_valuetype/field_cs.cpp:568
 
 // Accessor to set the member.
 void
@@ -536,7 +404,7 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:742
+// be\be_visitor_valuetype/field_cs.cpp:743
 
 // Accessor to set the member.
 void
@@ -560,120 +428,7 @@ OBV_Messaging::ExceptionHolder::marshaled_exception (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
-
-
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
-      _tao_any,
-      Messaging::ExceptionHolder::_tao_any_destructor,
-      Messaging::_tc_ExceptionHolder,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
-        _tao_any,
-        Messaging::ExceptionHolder::_tao_any_destructor,
-        Messaging::_tc_ExceptionHolder,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr _tao_elem
-  )
-{
-  Messaging::ReplyHandler_ptr _tao_objptr =
-    Messaging::ReplyHandler::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyHandler>::insert (
-      _tao_any,
-      Messaging::ReplyHandler::_tao_any_destructor,
-      Messaging::_tc_ReplyHandler,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyHandler>::extract (
-        _tao_any,
-        Messaging::ReplyHandler::_tao_any_destructor,
-        Messaging::_tc_ReplyHandler,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:488
 
 void
 CORBA::add_ref (Messaging::ExceptionHolder * vt)
@@ -705,11 +460,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        ACE_const_cast (
-            Messaging::ExceptionHolder *,
-            _tao_valuetype
-          ),
-        (ptrdiff_t) &Messaging::ExceptionHolder::_downcast
+        const_cast<Messaging::ExceptionHolder *> (_tao_valuetype),
+        reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
       );
 }
 
@@ -763,26 +515,26 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
-  if ((strm >> obj.inout ()) == 0)
+  
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
-
+  
   typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -794,18 +546,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         Messaging::ExceptionHolder
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         Messaging::ExceptionHolder
-
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        Messaging::ExceptionHolder
+        
       >;
 
   template class
@@ -817,7 +564,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         Messaging::ReplyHandler
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         Messaging::ReplyHandler
@@ -828,11 +575,6 @@ CORBA::Boolean operator>> (
         Messaging::ReplyHandler
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyHandler
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -843,18 +585,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         Messaging::ExceptionHolder \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         Messaging::ExceptionHolder \
-
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ExceptionHolder \
+        
       >
 
 # pragma instantiate \
@@ -866,7 +603,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         Messaging::ReplyHandler
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         Messaging::ReplyHandler
@@ -877,9 +614,4 @@ CORBA::Boolean operator>> (
         Messaging::ReplyHandler \
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyHandler \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index da218e55e7d..e5b19589378 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -26,14 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
 #define _TAO_IDL_ORIG_MESSAGINGC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #ifndef TAO_MESSAGING_SAFE_INCLUDE
 #error "You should not include MessagingC.h directly, use Messaging.h"
@@ -44,13 +45,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/Objref_VarOut_T.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
 #include "tao/Valuetype/Value_VarOut_T.h"
+#include "tao/Objref_VarOut_T.h"
 
 #include "tao/PollableC.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
@@ -71,9 +74,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -82,7 +83,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -99,7 +100,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:527
+  // be\be_valuetype.cpp:525
   
   
 
@@ -167,7 +168,7 @@ namespace Messaging
     virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:250
+    // be\be_visitor_valuetype/valuetype_ch.cpp:238
   
   protected:
     ExceptionHolder (void);
@@ -204,7 +205,10 @@ namespace Messaging
     
     static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase *);
     
-    virtual CORBA::ValueBase *create_for_unmarshal (void);
+    virtual CORBA::ValueBase *
+    create_for_unmarshal (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
     
     // TAO-specific extensions
   public:
@@ -222,7 +226,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionHolder;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYHANDLER__VAR_OUT_CH_)
 #define _MESSAGING_REPLYHANDLER__VAR_OUT_CH_
@@ -273,7 +277,7 @@ namespace Messaging
     
     static ReplyHandler_ptr _nil (void)
     {
-      return (ReplyHandler_ptr)0;
+      return static_cast<ReplyHandler_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -417,8 +421,8 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
   {
-    static void tao_add_ref (Messaging::ExceptionHolder *);
-    static void tao_remove_ref (Messaging::ExceptionHolder *);
+    static void add_ref (Messaging::ExceptionHolder *);
+    static void remove_ref (Messaging::ExceptionHolder *);
     static void release (Messaging::ExceptionHolder *);
   };
 
@@ -428,17 +432,17 @@ namespace TAO
 #define _MESSAGING_REPLYHANDLER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyHandler>
   {
-    static Messaging::ReplyHandler_ptr duplicate (
-        Messaging::ReplyHandler_ptr
+    static ::Messaging::ReplyHandler_ptr duplicate (
+        ::Messaging::ReplyHandler_ptr
       );
     static void release (
-        Messaging::ReplyHandler_ptr
+        ::Messaging::ReplyHandler_ptr
       );
-    static Messaging::ReplyHandler_ptr nil (void);
+    static ::Messaging::ReplyHandler_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyHandler_ptr p,
+        ::Messaging::ReplyHandler_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -461,7 +465,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:432
 
 namespace CORBA
 {
@@ -482,13 +486,13 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "MessagingC.i"
+#include "MessagingC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -500,3 +504,4 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.inl
index 32030802a3d..010510949c3 100644
--- a/TAO/tao/Messaging/MessagingC.i
+++ b/TAO/tao/Messaging/MessagingC.inl
@@ -78,4 +78,3 @@ Messaging::ReplyHandler::ReplyHandler (
 }
 
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 463beeaba52..20495ce97a6 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:631
+// be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_CPP_
@@ -47,26 +47,25 @@
 #include "tao/CDR.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingS.i"
+#include "MessagingS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -75,7 +74,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1534
+// be\be_interface.cpp:1536
 
 class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -278,7 +277,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -312,7 +311,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:631
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -333,8 +332,8 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (size_t)
 static int
 Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer
         )
     );
@@ -400,7 +399,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_servant;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -430,7 +429,7 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
   )
 {
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_servant;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -463,7 +462,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     }
   
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_servant;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -494,7 +493,7 @@ void POA_Messaging::ReplyHandler::_component_skel (
   )
 {
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_object_reference;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -514,23 +513,17 @@ CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyHandler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_Messaging::ReplyHandler::_downcast (
@@ -540,13 +533,13 @@ void* POA_Messaging::ReplyHandler::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/Messaging/ReplyHandler:1.0") == 0)
     {
-      return ACE_static_cast (POA_Messaging::ReplyHandler_ptr, this);
+      return static_cast<POA_Messaging::ReplyHandler_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -558,7 +551,7 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:567
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_Messaging::ReplyHandler::_dispatch (
     TAO_ServerRequest &req,
@@ -573,7 +566,7 @@ void POA_Messaging::ReplyHandler::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:509
+// be\be_visitor_interface/interface_ss.cpp:527
 
 Messaging::ReplyHandler *
 POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -584,22 +577,14 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
   
-  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -612,4 +597,14 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1683
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 4b395602058..3e56fcfabeb 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -26,14 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "Messaging.h"
+#include "tao/PollableS.h"
+#include "tao/Messaging/Messaging.h"
+#include "tao/OctetSeqS.h"
+#include "MessagingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,9 +47,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -59,105 +60,105 @@
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:90
-  
+  // be\be_visitor_interface/interface_sh.cpp:87
+
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  
+
   class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
   class _TAO_ReplyHandler_Direct_Proxy_Impl;
   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
-  
+
   class TAO_Messaging_Export ReplyHandler
     : public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::Messaging::ReplyHandler _stub_type;
     typedef ::Messaging::ReplyHandler_ptr _stub_ptr_type;
     typedef ::Messaging::ReplyHandler_var _stub_var_type;
-    
+
     ReplyHandler (const ReplyHandler& rhs);
     virtual ~ReplyHandler (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::Messaging::ReplyHandler *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_Messaging_Export _TAO_ReplyHandler_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -170,31 +171,31 @@ namespace POA_Messaging
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_ReplyHandler_Strategized_Proxy_Broker *
     the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_Messaging_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ReplyHandler_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) {}
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
@@ -226,15 +227,15 @@ namespace POA_Messaging
 } // module Messaging
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1014
+// be\be_codegen.cpp:997
 
 #include "MessagingS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "MessagingS.i"
+#include "MessagingS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -244,3 +245,4 @@ namespace POA_Messaging
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.i b/TAO/tao/Messaging/MessagingS.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.i
+++ b/TAO/tao/Messaging/MessagingS.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
index 11c7922cde6..e6b0607477c 100644
--- a/TAO/tao/Messaging/MessagingS_T.cpp
+++ b/TAO/tao/Messaging/MessagingS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:705
+// be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
@@ -34,7 +34,7 @@
 #include "MessagingS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
+#include "MessagingS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index 361b0ee3ce2..44c33204372 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:546
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_H_
@@ -34,9 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -44,7 +42,6 @@
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_Messaging
 {
   
@@ -98,13 +95,12 @@ namespace POA_Messaging
     void operator= (const ReplyHandler_tie &);
   };
 } // module Messaging
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1111
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
+#include "MessagingS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -115,9 +111,10 @@ namespace POA_Messaging
 #pragma implementation ("MessagingS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/MessagingS_T.i b/TAO/tao/Messaging/MessagingS_T.inl
index d796f9aad7f..0a3b3cfd130 100644
--- a/TAO/tao/Messaging/MessagingS_T.i
+++ b/TAO/tao/Messaging/MessagingS_T.inl
@@ -29,8 +29,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
-#if defined (ACE_HAS_USING_KEYWORD)
-
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
 	: ptr_ (&t),
@@ -121,5 +119,3 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
   return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index c2c9edcd90b..f516a6528e9 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -22,14 +22,14 @@
  *
  * after the file is generated a patch must be applied:
  *
- *   cp orig/Messaging_No_Impl{C,S,S_T}.{h,i,cpp} .
+ *   cp orig/Messaging_No_Impl{C,S}.{h,inl,cpp} .
  *   patch < diffs/Messaging.diff
  *
  * The patch eliminates cycles in the include dependencies.
  *
  * Note: to update the patch file after re-generating the code use:
  *
- *   for i in Messaging_No_Impl{C,S,S_T}.{h,i,cpp}; do
+ *   for i in Messaging_No_Impl{C,S}.{h,inl,cpp}; do
  *     diff -uBbw orig/$i $i;
  *   done > diffs/Messaging_No_Impl.diff
  */
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
new file mode 100644
index 00000000000..d4a87ee8c11
--- /dev/null
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
@@ -0,0 +1,1819 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "Messaging_No_ImplC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_Priority[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5072), 
+  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x74793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
+    9,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x0),  // name = Priority
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_Priority (
+    CORBA::tk_alias,
+    sizeof (_oc_Messaging_Priority),
+    (char *) &_oc_Messaging_Priority,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_Priority =
+    &_tc_TAO_tc_Messaging_Priority;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RebindMode[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x62696e64), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
+    11,
+  ACE_NTOHL (0x52656269), 
+  ACE_NTOHL (0x6e644d6f), 
+  ACE_NTOHL (0x64650000),  // name = RebindMode
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindMode (
+    CORBA::tk_alias,
+    sizeof (_oc_Messaging_RebindMode),
+    (char *) &_oc_Messaging_RebindMode,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RebindMode =
+    &_tc_TAO_tc_Messaging_RebindMode;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RoutingType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f526f), 
+  ACE_NTOHL (0x7574696e), 
+  ACE_NTOHL (0x67547970), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
+    12,
+  ACE_NTOHL (0x526f7574), 
+  ACE_NTOHL (0x696e6754), 
+  ACE_NTOHL (0x79706500),  // name = RoutingType
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingType (
+    CORBA::tk_alias,
+    sizeof (_oc_Messaging_RoutingType),
+    (char *) &_oc_Messaging_RoutingType,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RoutingType =
+    &_tc_TAO_tc_Messaging_RoutingType;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_Ordering[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f4f72), 
+  ACE_NTOHL (0x64657269), 
+  ACE_NTOHL (0x6e673a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
+    9,
+  ACE_NTOHL (0x4f726465), 
+  ACE_NTOHL (0x72696e67), 
+  ACE_NTOHL (0x0),  // name = Ordering
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_Ordering (
+    CORBA::tk_alias,
+    sizeof (_oc_Messaging_Ordering),
+    (char *) &_oc_Messaging_Ordering,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_Ordering =
+    &_tc_TAO_tc_Messaging_Ordering;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RebindPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x62696e64), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0
+    13,
+  ACE_NTOHL (0x52656269), 
+  ACE_NTOHL (0x6e64506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = RebindPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RebindPolicy),
+    (char *) &_oc_Messaging_RebindPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RebindPolicy =
+    &_tc_TAO_tc_Messaging_RebindPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_PriorityRange[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5072), 
+  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x74795261), 
+  ACE_NTOHL (0x6e67653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
+    14,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x52616e67), 
+  ACE_NTOHL (0x65000000),  // name = PriorityRange
+  2, // member count
+    4,
+  ACE_NTOHL (0x6d696e00),  // name = min
+    CORBA::tk_alias, // typecode kind for typedefs
+  64, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f5072), 
+    ACE_NTOHL (0x696f7269), 
+    ACE_NTOHL (0x74793a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
+
+
+  4,
+  ACE_NTOHL (0x6d617800),  // name = max
+    CORBA::tk_alias, // typecode kind for typedefs
+  64, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f5072), 
+    ACE_NTOHL (0x696f7269), 
+    ACE_NTOHL (0x74793a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (
+    CORBA::tk_struct,
+    sizeof (_oc_Messaging_PriorityRange),
+    (char *) &_oc_Messaging_PriorityRange,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityRange =
+    &_tc_TAO_tc_Messaging_PriorityRange;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74507269), 
+  ACE_NTOHL (0x6f726974), 
+  ACE_NTOHL (0x79506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0
+    22,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737450), 
+  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x69747950), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RequestPriorityPolicy),
+    (char *) &_oc_Messaging_RequestPriorityPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RequestPriorityPolicy =
+    &_tc_TAO_tc_Messaging_RequestPriorityPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x706c7950), 
+  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x69747950), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0
+    20,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79507269), 
+  ACE_NTOHL (0x6f726974), 
+  ACE_NTOHL (0x79506f6c), 
+  ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_ReplyPriorityPolicy),
+    (char *) &_oc_Messaging_ReplyPriorityPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy =
+    &_tc_TAO_tc_Messaging_ReplyPriorityPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74537461), 
+  ACE_NTOHL (0x72745469), 
+  ACE_NTOHL (0x6d65506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0
+    23,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737453), 
+  ACE_NTOHL (0x74617274), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RequestStartTimePolicy),
+    (char *) &_oc_Messaging_RequestStartTimePolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RequestStartTimePolicy =
+    &_tc_TAO_tc_Messaging_RequestStartTimePolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74456e64), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0
+    21,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737445), 
+  ACE_NTOHL (0x6e645469), 
+  ACE_NTOHL (0x6d65506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = RequestEndTimePolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RequestEndTimePolicy),
+    (char *) &_oc_Messaging_RequestEndTimePolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RequestEndTimePolicy =
+    &_tc_TAO_tc_Messaging_RequestEndTimePolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x706c7953), 
+  ACE_NTOHL (0x74617274), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0
+    21,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x72745469), 
+  ACE_NTOHL (0x6d65506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_ReplyStartTimePolicy),
+    (char *) &_oc_Messaging_ReplyStartTimePolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy =
+    &_tc_TAO_tc_Messaging_ReplyStartTimePolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x706c7945), 
+  ACE_NTOHL (0x6e645469), 
+  ACE_NTOHL (0x6d65506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0
+    19,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79456e64), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_ReplyEndTimePolicy),
+    (char *) &_oc_Messaging_ReplyEndTimePolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy =
+    &_tc_TAO_tc_Messaging_ReplyEndTimePolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x6c617469), 
+  ACE_NTOHL (0x76655265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x7454696d), 
+  ACE_NTOHL (0x656f7574), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0
+    29,
+  ACE_NTOHL (0x52656c61), 
+  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737454), 
+  ACE_NTOHL (0x696d656f), 
+  ACE_NTOHL (0x7574506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy),
+    (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy =
+    &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f526f), 
+  ACE_NTOHL (0x7574696e), 
+  ACE_NTOHL (0x67547970), 
+  ACE_NTOHL (0x6552616e), 
+  ACE_NTOHL (0x67653a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
+    17,
+  ACE_NTOHL (0x526f7574), 
+  ACE_NTOHL (0x696e6754), 
+  ACE_NTOHL (0x79706552), 
+  ACE_NTOHL (0x616e6765), 
+  ACE_NTOHL (0x0),  // name = RoutingTypeRange
+  2, // member count
+    4,
+  ACE_NTOHL (0x6d696e00),  // name = min
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f526f), 
+    ACE_NTOHL (0x7574696e), 
+    ACE_NTOHL (0x67547970), 
+    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
+        12,
+    ACE_NTOHL (0x526f7574), 
+    ACE_NTOHL (0x696e6754), 
+    ACE_NTOHL (0x79706500),  // name = RoutingType
+        CORBA::tk_short,
+
+
+  4,
+  ACE_NTOHL (0x6d617800),  // name = max
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f526f), 
+    ACE_NTOHL (0x7574696e), 
+    ACE_NTOHL (0x67547970), 
+    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
+        12,
+    ACE_NTOHL (0x526f7574), 
+    ACE_NTOHL (0x696e6754), 
+    ACE_NTOHL (0x79706500),  // name = RoutingType
+        CORBA::tk_short,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (
+    CORBA::tk_struct,
+    sizeof (_oc_Messaging_RoutingTypeRange),
+    (char *) &_oc_Messaging_RoutingTypeRange,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RoutingTypeRange =
+    &_tc_TAO_tc_Messaging_RoutingTypeRange;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f526f), 
+  ACE_NTOHL (0x7574696e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0
+    14,
+  ACE_NTOHL (0x526f7574), 
+  ACE_NTOHL (0x696e6750), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x79000000),  // name = RoutingPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RoutingPolicy),
+    (char *) &_oc_Messaging_RoutingPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RoutingPolicy =
+    &_tc_TAO_tc_Messaging_RoutingPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f4d61), 
+  ACE_NTOHL (0x78486f70), 
+  ACE_NTOHL (0x73506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0
+    14,
+  ACE_NTOHL (0x4d617848), 
+  ACE_NTOHL (0x6f707350), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_MaxHopsPolicy),
+    (char *) &_oc_Messaging_MaxHopsPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_MaxHopsPolicy =
+    &_tc_TAO_tc_Messaging_MaxHopsPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5175), 
+  ACE_NTOHL (0x6575654f), 
+  ACE_NTOHL (0x72646572), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0
+    17,
+  ACE_NTOHL (0x51756575), 
+  ACE_NTOHL (0x654f7264), 
+  ACE_NTOHL (0x6572506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = QueueOrderPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_QueueOrderPolicy),
+    (char *) &_oc_Messaging_QueueOrderPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy =
+    &_tc_TAO_tc_Messaging_QueueOrderPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RebindPolicy>::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<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RebindPolicy_ptr _tao_elem
+  )
+{
+  Messaging::RebindPolicy_ptr _tao_objptr =
+    Messaging::RebindPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RebindPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RebindPolicy>::insert (
+      _tao_any,
+      Messaging::RebindPolicy::_tao_any_destructor,
+      Messaging::_tc_RebindPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RebindPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RebindPolicy>::extract (
+        _tao_any,
+        Messaging::RebindPolicy::_tao_any_destructor,
+        Messaging::_tc_RebindPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const Messaging::PriorityRange &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert_copy (
+      _tao_any,
+      Messaging::PriorityRange::_tao_any_destructor,
+      Messaging::_tc_PriorityRange,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::PriorityRange *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert (
+      _tao_any,
+      Messaging::PriorityRange::_tao_any_destructor,
+      Messaging::_tc_PriorityRange,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::PriorityRange *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const Messaging::PriorityRange *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Messaging::PriorityRange *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::extract (
+        _tao_any,
+        Messaging::PriorityRange::_tao_any_destructor,
+        Messaging::_tc_PriorityRange,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::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<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RequestPriorityPolicy_ptr _tao_elem
+  )
+{
+  Messaging::RequestPriorityPolicy_ptr _tao_objptr =
+    Messaging::RequestPriorityPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RequestPriorityPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::insert (
+      _tao_any,
+      Messaging::RequestPriorityPolicy::_tao_any_destructor,
+      Messaging::_tc_RequestPriorityPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RequestPriorityPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::extract (
+        _tao_any,
+        Messaging::RequestPriorityPolicy::_tao_any_destructor,
+        Messaging::_tc_RequestPriorityPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::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<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyPriorityPolicy_ptr _tao_elem
+  )
+{
+  Messaging::ReplyPriorityPolicy_ptr _tao_objptr =
+    Messaging::ReplyPriorityPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyPriorityPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::insert (
+      _tao_any,
+      Messaging::ReplyPriorityPolicy::_tao_any_destructor,
+      Messaging::_tc_ReplyPriorityPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::ReplyPriorityPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::extract (
+        _tao_any,
+        Messaging::ReplyPriorityPolicy::_tao_any_destructor,
+        Messaging::_tc_ReplyPriorityPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::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<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RequestStartTimePolicy_ptr _tao_elem
+  )
+{
+  Messaging::RequestStartTimePolicy_ptr _tao_objptr =
+    Messaging::RequestStartTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RequestStartTimePolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::insert (
+      _tao_any,
+      Messaging::RequestStartTimePolicy::_tao_any_destructor,
+      Messaging::_tc_RequestStartTimePolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RequestStartTimePolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::extract (
+        _tao_any,
+        Messaging::RequestStartTimePolicy::_tao_any_destructor,
+        Messaging::_tc_RequestStartTimePolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::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<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RequestEndTimePolicy_ptr _tao_elem
+  )
+{
+  Messaging::RequestEndTimePolicy_ptr _tao_objptr =
+    Messaging::RequestEndTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RequestEndTimePolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::insert (
+      _tao_any,
+      Messaging::RequestEndTimePolicy::_tao_any_destructor,
+      Messaging::_tc_RequestEndTimePolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RequestEndTimePolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::extract (
+        _tao_any,
+        Messaging::RequestEndTimePolicy::_tao_any_destructor,
+        Messaging::_tc_RequestEndTimePolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::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<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyStartTimePolicy_ptr _tao_elem
+  )
+{
+  Messaging::ReplyStartTimePolicy_ptr _tao_objptr =
+    Messaging::ReplyStartTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyStartTimePolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::insert (
+      _tao_any,
+      Messaging::ReplyStartTimePolicy::_tao_any_destructor,
+      Messaging::_tc_ReplyStartTimePolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::ReplyStartTimePolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::extract (
+        _tao_any,
+        Messaging::ReplyStartTimePolicy::_tao_any_destructor,
+        Messaging::_tc_ReplyStartTimePolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::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<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyEndTimePolicy_ptr _tao_elem
+  )
+{
+  Messaging::ReplyEndTimePolicy_ptr _tao_objptr =
+    Messaging::ReplyEndTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::ReplyEndTimePolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::insert (
+      _tao_any,
+      Messaging::ReplyEndTimePolicy::_tao_any_destructor,
+      Messaging::_tc_ReplyEndTimePolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::ReplyEndTimePolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::extract (
+        _tao_any,
+        Messaging::ReplyEndTimePolicy::_tao_any_destructor,
+        Messaging::_tc_ReplyEndTimePolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::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<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RelativeRequestTimeoutPolicy_ptr _tao_elem
+  )
+{
+  Messaging::RelativeRequestTimeoutPolicy_ptr _tao_objptr =
+    Messaging::RelativeRequestTimeoutPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RelativeRequestTimeoutPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::insert (
+      _tao_any,
+      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
+      Messaging::_tc_RelativeRequestTimeoutPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::extract (
+        _tao_any,
+        Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
+        Messaging::_tc_RelativeRequestTimeoutPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const Messaging::RoutingTypeRange &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert_copy (
+      _tao_any,
+      Messaging::RoutingTypeRange::_tao_any_destructor,
+      Messaging::_tc_RoutingTypeRange,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RoutingTypeRange *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert (
+      _tao_any,
+      Messaging::RoutingTypeRange::_tao_any_destructor,
+      Messaging::_tc_RoutingTypeRange,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RoutingTypeRange *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const Messaging::RoutingTypeRange *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Messaging::RoutingTypeRange *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::extract (
+        _tao_any,
+        Messaging::RoutingTypeRange::_tao_any_destructor,
+        Messaging::_tc_RoutingTypeRange,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RoutingPolicy>::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<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RoutingPolicy_ptr _tao_elem
+  )
+{
+  Messaging::RoutingPolicy_ptr _tao_objptr =
+    Messaging::RoutingPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RoutingPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RoutingPolicy>::insert (
+      _tao_any,
+      Messaging::RoutingPolicy::_tao_any_destructor,
+      Messaging::_tc_RoutingPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RoutingPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RoutingPolicy>::extract (
+        _tao_any,
+        Messaging::RoutingPolicy::_tao_any_destructor,
+        Messaging::_tc_RoutingPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::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<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::MaxHopsPolicy_ptr _tao_elem
+  )
+{
+  Messaging::MaxHopsPolicy_ptr _tao_objptr =
+    Messaging::MaxHopsPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::MaxHopsPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::insert (
+      _tao_any,
+      Messaging::MaxHopsPolicy::_tao_any_destructor,
+      Messaging::_tc_MaxHopsPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::MaxHopsPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::extract (
+        _tao_any,
+        Messaging::MaxHopsPolicy::_tao_any_destructor,
+        Messaging::_tc_MaxHopsPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::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<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::QueueOrderPolicy_ptr _tao_elem
+  )
+{
+  Messaging::QueueOrderPolicy_ptr _tao_objptr =
+    Messaging::QueueOrderPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::QueueOrderPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::insert (
+      _tao_any,
+      Messaging::QueueOrderPolicy::_tao_any_destructor,
+      Messaging::_tc_QueueOrderPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::QueueOrderPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::extract (
+        _tao_any,
+        Messaging::QueueOrderPolicy::_tao_any_destructor,
+        Messaging::_tc_QueueOrderPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RebindPolicy
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        Messaging::PriorityRange
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RequestPriorityPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::ReplyPriorityPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RequestStartTimePolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RequestEndTimePolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::ReplyStartTimePolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::ReplyEndTimePolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RelativeRequestTimeoutPolicy
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        Messaging::RoutingTypeRange
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RoutingPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::MaxHopsPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::QueueOrderPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RebindPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        Messaging::PriorityRange \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RequestPriorityPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::ReplyPriorityPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RequestStartTimePolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RequestEndTimePolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::ReplyStartTimePolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::ReplyEndTimePolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RelativeRequestTimeoutPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        Messaging::RoutingTypeRange \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RoutingPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::MaxHopsPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::QueueOrderPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index c6ba7f3fc9b..d9a76f35b35 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -26,14 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_No_ImplC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -41,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_No_ImplC.i"
+#include "Messaging_No_ImplC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -54,160 +51,6 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_Priority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-    9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Priority (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Priority),
-    (char *) &_oc_Messaging_Priority,
-    0,
-    sizeof (Messaging::Priority)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_Priority =
-    &_tc_TAO_tc_Messaging_Priority;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RebindMode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
-    11,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e644d6f), 
-  ACE_NTOHL (0x64650000),  // name = RebindMode
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindMode (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_RebindMode),
-    (char *) &_oc_Messaging_RebindMode,
-    0,
-    sizeof (Messaging::RebindMode)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RebindMode =
-    &_tc_TAO_tc_Messaging_RebindMode;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RoutingType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-    12,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706500),  // name = RoutingType
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingType (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_RoutingType),
-    (char *) &_oc_Messaging_RoutingType,
-    0,
-    sizeof (Messaging::RoutingType)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RoutingType =
-    &_tc_TAO_tc_Messaging_RoutingType;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_Ordering[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4f72), 
-  ACE_NTOHL (0x64657269), 
-  ACE_NTOHL (0x6e673a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
-    9,
-  ACE_NTOHL (0x4f726465), 
-  ACE_NTOHL (0x72696e67), 
-  ACE_NTOHL (0x0),  // name = Ordering
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Ordering (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Ordering),
-    (char *) &_oc_Messaging_Ordering,
-    0,
-    sizeof (Messaging::Ordering)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_Ordering =
-    &_tc_TAO_tc_Messaging_Ordering;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RebindPolicy.
@@ -247,12 +90,6 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RebindPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RebindPolicy::RebindPolicy (void)
 {}
 
@@ -263,7 +100,7 @@ void
 Messaging::RebindPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RebindPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RebindPolicy *, _tao_void_pointer);
+    static_cast<RebindPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -320,22 +157,22 @@ Messaging::RebindPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RebindPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -356,127 +193,6 @@ Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RebindPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0
-    13,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e64506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RebindPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RebindPolicy),
-    (char *) &_oc_Messaging_RebindPolicy,
-    0,
-    sizeof (Messaging::RebindPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RebindPolicy =
-    &_tc_TAO_tc_Messaging_RebindPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_PriorityRange[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74795261), 
-  ACE_NTOHL (0x6e67653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
-    14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x52616e67), 
-  ACE_NTOHL (0x65000000),  // name = PriorityRange
-  2, // member count
-    4,
-  ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  4,
-  ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_PriorityRange),
-    (char *) &_oc_Messaging_PriorityRange,
-    0,
-    sizeof (Messaging::PriorityRange)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityRange =
-    &_tc_TAO_tc_Messaging_PriorityRange;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -486,7 +202,7 @@ Messaging::PriorityRange::_tao_any_destructor (
   )
 {
   PriorityRange *_tao_tmp_pointer =
-    ACE_static_cast (PriorityRange *, _tao_void_pointer);
+    static_cast<PriorityRange *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -530,12 +246,6 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RequestPriorityPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
 {}
 
@@ -546,7 +256,7 @@ void
 Messaging::RequestPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestPriorityPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RequestPriorityPolicy *, _tao_void_pointer);
+    static_cast<RequestPriorityPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -603,22 +313,22 @@ Messaging::RequestPriorityPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -640,48 +350,6 @@ Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0
-    22,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestPriorityPolicy),
-    (char *) &_oc_Messaging_RequestPriorityPolicy,
-    0,
-    sizeof (Messaging::RequestPriorityPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RequestPriorityPolicy =
-    &_tc_TAO_tc_Messaging_RequestPriorityPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyPriorityPolicy.
@@ -721,12 +389,6 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyPriorityPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
 {}
 
@@ -737,7 +399,7 @@ void
 Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyPriorityPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ReplyPriorityPolicy *, _tao_void_pointer);
+    static_cast<ReplyPriorityPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -794,22 +456,22 @@ Messaging::ReplyPriorityPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -831,47 +493,6 @@ Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7950), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0
-    20,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyPriorityPolicy),
-    (char *) &_oc_Messaging_ReplyPriorityPolicy,
-    0,
-    sizeof (Messaging::ReplyPriorityPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy =
-    &_tc_TAO_tc_Messaging_ReplyPriorityPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RequestStartTimePolicy.
@@ -911,12 +532,6 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RequestStartTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
 {}
 
@@ -927,7 +542,7 @@ void
 Messaging::RequestStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestStartTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (RequestStartTimePolicy *, _tao_void_pointer);
+    static_cast<RequestStartTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -984,22 +599,22 @@ Messaging::RequestStartTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1021,49 +636,6 @@ Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0
-    23,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737453), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestStartTimePolicy),
-    (char *) &_oc_Messaging_RequestStartTimePolicy,
-    0,
-    sizeof (Messaging::RequestStartTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RequestStartTimePolicy =
-    &_tc_TAO_tc_Messaging_RequestStartTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RequestEndTimePolicy.
@@ -1103,12 +675,6 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RequestEndTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
 {}
 
@@ -1119,7 +685,7 @@ void
 Messaging::RequestEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestEndTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (RequestEndTimePolicy *, _tao_void_pointer);
+    static_cast<RequestEndTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1176,22 +742,22 @@ Messaging::RequestEndTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1213,48 +779,6 @@ Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0
-    21,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737445), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RequestEndTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestEndTimePolicy),
-    (char *) &_oc_Messaging_RequestEndTimePolicy,
-    0,
-    sizeof (Messaging::RequestEndTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RequestEndTimePolicy =
-    &_tc_TAO_tc_Messaging_RequestEndTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyStartTimePolicy.
@@ -1294,12 +818,6 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyStartTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
 {}
 
@@ -1310,7 +828,7 @@ void
 Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyStartTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (ReplyStartTimePolicy *, _tao_void_pointer);
+    static_cast<ReplyStartTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1367,22 +885,22 @@ Messaging::ReplyStartTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1404,48 +922,6 @@ Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7953), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0
-    21,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyStartTimePolicy),
-    (char *) &_oc_Messaging_ReplyStartTimePolicy,
-    0,
-    sizeof (Messaging::ReplyStartTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy =
-    &_tc_TAO_tc_Messaging_ReplyStartTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyEndTimePolicy.
@@ -1485,12 +961,6 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyEndTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
 {}
 
@@ -1501,7 +971,7 @@ void
 Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyEndTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (ReplyEndTimePolicy *, _tao_void_pointer);
+    static_cast<ReplyEndTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1558,22 +1028,22 @@ Messaging::ReplyEndTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1595,47 +1065,6 @@ Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7945), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0
-    19,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyEndTimePolicy),
-    (char *) &_oc_Messaging_ReplyEndTimePolicy,
-    0,
-    sizeof (Messaging::ReplyEndTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy =
-    &_tc_TAO_tc_Messaging_ReplyEndTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RelativeRequestTimeoutPolicy.
@@ -1675,12 +1104,6 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RelativeRequestTimeoutPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
 {}
 
@@ -1691,7 +1114,7 @@ void
 Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RelativeRequestTimeoutPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RelativeRequestTimeoutPolicy *, _tao_void_pointer);
+    static_cast<RelativeRequestTimeoutPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1748,22 +1171,22 @@ Messaging::RelativeRequestTimeoutPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1784,139 +1207,6 @@ Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x76655265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x7454696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0
-    29,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737454), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy),
-    (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy,
-    0,
-    sizeof (Messaging::RelativeRequestTimeoutPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy =
-    &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x6552616e), 
-  ACE_NTOHL (0x67653a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
-    17,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706552), 
-  ACE_NTOHL (0x616e6765), 
-  ACE_NTOHL (0x0),  // name = RoutingTypeRange
-  2, // member count
-    4,
-  ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-        12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
-    ACE_NTOHL (0x79706500),  // name = RoutingType
-        CORBA::tk_short,
-
-
-  4,
-  ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-        12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
-    ACE_NTOHL (0x79706500),  // name = RoutingType
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_RoutingTypeRange),
-    (char *) &_oc_Messaging_RoutingTypeRange,
-    0,
-    sizeof (Messaging::RoutingTypeRange)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RoutingTypeRange =
-    &_tc_TAO_tc_Messaging_RoutingTypeRange;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1926,7 +1216,7 @@ Messaging::RoutingTypeRange::_tao_any_destructor (
   )
 {
   RoutingTypeRange *_tao_tmp_pointer =
-    ACE_static_cast (RoutingTypeRange *, _tao_void_pointer);
+    static_cast<RoutingTypeRange *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1970,12 +1260,6 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RoutingPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RoutingPolicy::RoutingPolicy (void)
 {}
 
@@ -1986,7 +1270,7 @@ void
 Messaging::RoutingPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RoutingPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RoutingPolicy *, _tao_void_pointer);
+    static_cast<RoutingPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2043,22 +1327,22 @@ Messaging::RoutingPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RoutingPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2080,44 +1364,6 @@ Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0
-    14,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6750), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = RoutingPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RoutingPolicy),
-    (char *) &_oc_Messaging_RoutingPolicy,
-    0,
-    sizeof (Messaging::RoutingPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RoutingPolicy =
-    &_tc_TAO_tc_Messaging_RoutingPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::MaxHopsPolicy.
@@ -2157,12 +1403,6 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_MaxHopsPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
 {}
 
@@ -2173,7 +1413,7 @@ void
 Messaging::MaxHopsPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   MaxHopsPolicy *_tao_tmp_pointer =
-    ACE_static_cast (MaxHopsPolicy *, _tao_void_pointer);
+    static_cast<MaxHopsPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2230,22 +1470,22 @@ Messaging::MaxHopsPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/MaxHopsPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2267,44 +1507,6 @@ Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4d61), 
-  ACE_NTOHL (0x78486f70), 
-  ACE_NTOHL (0x73506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0
-    14,
-  ACE_NTOHL (0x4d617848), 
-  ACE_NTOHL (0x6f707350), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_MaxHopsPolicy),
-    (char *) &_oc_Messaging_MaxHopsPolicy,
-    0,
-    sizeof (Messaging::MaxHopsPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_MaxHopsPolicy =
-    &_tc_TAO_tc_Messaging_MaxHopsPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::QueueOrderPolicy.
@@ -2344,12 +1546,6 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_QueueOrderPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
 {}
 
@@ -2360,7 +1556,7 @@ void
 Messaging::QueueOrderPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   QueueOrderPolicy *_tao_tmp_pointer =
-    ACE_static_cast (QueueOrderPolicy *, _tao_void_pointer);
+    static_cast<QueueOrderPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2417,22 +1613,22 @@ Messaging::QueueOrderPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/QueueOrderPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2454,921 +1650,6 @@ Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5175), 
-  ACE_NTOHL (0x6575654f), 
-  ACE_NTOHL (0x72646572), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0
-    17,
-  ACE_NTOHL (0x51756575), 
-  ACE_NTOHL (0x654f7264), 
-  ACE_NTOHL (0x6572506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = QueueOrderPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_QueueOrderPolicy),
-    (char *) &_oc_Messaging_QueueOrderPolicy,
-    0,
-    sizeof (Messaging::QueueOrderPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy =
-    &_tc_TAO_tc_Messaging_QueueOrderPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::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<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RebindPolicy_ptr _tao_objptr =
-    Messaging::RebindPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RebindPolicy>::insert (
-      _tao_any,
-      Messaging::RebindPolicy::_tao_any_destructor,
-      Messaging::_tc_RebindPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RebindPolicy>::extract (
-        _tao_any,
-        Messaging::RebindPolicy::_tao_any_destructor,
-        Messaging::_tc_RebindPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PriorityRange &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert_copy (
-      _tao_any,
-      Messaging::PriorityRange::_tao_any_destructor,
-      Messaging::_tc_PriorityRange,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PriorityRange *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert (
-      _tao_any,
-      Messaging::PriorityRange::_tao_any_destructor,
-      Messaging::_tc_PriorityRange,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PriorityRange *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const Messaging::PriorityRange *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PriorityRange *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::extract (
-        _tao_any,
-        Messaging::PriorityRange::_tao_any_destructor,
-        Messaging::_tc_PriorityRange,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::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<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestPriorityPolicy_ptr _tao_objptr =
-    Messaging::RequestPriorityPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::insert (
-      _tao_any,
-      Messaging::RequestPriorityPolicy::_tao_any_destructor,
-      Messaging::_tc_RequestPriorityPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::extract (
-        _tao_any,
-        Messaging::RequestPriorityPolicy::_tao_any_destructor,
-        Messaging::_tc_RequestPriorityPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::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<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyPriorityPolicy_ptr _tao_objptr =
-    Messaging::ReplyPriorityPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::insert (
-      _tao_any,
-      Messaging::ReplyPriorityPolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyPriorityPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::extract (
-        _tao_any,
-        Messaging::ReplyPriorityPolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyPriorityPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::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<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestStartTimePolicy_ptr _tao_objptr =
-    Messaging::RequestStartTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::insert (
-      _tao_any,
-      Messaging::RequestStartTimePolicy::_tao_any_destructor,
-      Messaging::_tc_RequestStartTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::extract (
-        _tao_any,
-        Messaging::RequestStartTimePolicy::_tao_any_destructor,
-        Messaging::_tc_RequestStartTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::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<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestEndTimePolicy_ptr _tao_objptr =
-    Messaging::RequestEndTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::insert (
-      _tao_any,
-      Messaging::RequestEndTimePolicy::_tao_any_destructor,
-      Messaging::_tc_RequestEndTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::extract (
-        _tao_any,
-        Messaging::RequestEndTimePolicy::_tao_any_destructor,
-        Messaging::_tc_RequestEndTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::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<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyStartTimePolicy_ptr _tao_objptr =
-    Messaging::ReplyStartTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::insert (
-      _tao_any,
-      Messaging::ReplyStartTimePolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyStartTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::extract (
-        _tao_any,
-        Messaging::ReplyStartTimePolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyStartTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::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<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyEndTimePolicy_ptr _tao_objptr =
-    Messaging::ReplyEndTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::insert (
-      _tao_any,
-      Messaging::ReplyEndTimePolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyEndTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::extract (
-        _tao_any,
-        Messaging::ReplyEndTimePolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyEndTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::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<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RelativeRequestTimeoutPolicy_ptr _tao_objptr =
-    Messaging::RelativeRequestTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::insert (
-      _tao_any,
-      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
-      Messaging::_tc_RelativeRequestTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::extract (
-        _tao_any,
-        Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
-        Messaging::_tc_RelativeRequestTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::RoutingTypeRange &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert_copy (
-      _tao_any,
-      Messaging::RoutingTypeRange::_tao_any_destructor,
-      Messaging::_tc_RoutingTypeRange,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingTypeRange *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert (
-      _tao_any,
-      Messaging::RoutingTypeRange::_tao_any_destructor,
-      Messaging::_tc_RoutingTypeRange,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RoutingTypeRange *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const Messaging::RoutingTypeRange *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::RoutingTypeRange *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::extract (
-        _tao_any,
-        Messaging::RoutingTypeRange::_tao_any_destructor,
-        Messaging::_tc_RoutingTypeRange,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::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<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RoutingPolicy_ptr _tao_objptr =
-    Messaging::RoutingPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RoutingPolicy>::insert (
-      _tao_any,
-      Messaging::RoutingPolicy::_tao_any_destructor,
-      Messaging::_tc_RoutingPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RoutingPolicy>::extract (
-        _tao_any,
-        Messaging::RoutingPolicy::_tao_any_destructor,
-        Messaging::_tc_RoutingPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::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<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr _tao_elem
-  )
-{
-  Messaging::MaxHopsPolicy_ptr _tao_objptr =
-    Messaging::MaxHopsPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::insert (
-      _tao_any,
-      Messaging::MaxHopsPolicy::_tao_any_destructor,
-      Messaging::_tc_MaxHopsPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::extract (
-        _tao_any,
-        Messaging::MaxHopsPolicy::_tao_any_destructor,
-        Messaging::_tc_MaxHopsPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::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<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr _tao_elem
-  )
-{
-  Messaging::QueueOrderPolicy_ptr _tao_objptr =
-    Messaging::QueueOrderPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::insert (
-      _tao_any,
-      Messaging::QueueOrderPolicy::_tao_any_destructor,
-      Messaging::_tc_QueueOrderPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::extract (
-        _tao_any,
-        Messaging::QueueOrderPolicy::_tao_any_destructor,
-        Messaging::_tc_QueueOrderPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
@@ -3415,7 +1696,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -3435,11 +1716,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RebindPolicy
-      >;
-
-  template class
     TAO_Fixed_Var_T<
         Messaging::PriorityRange
       >;
@@ -3450,11 +1726,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        Messaging::PriorityRange
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RequestPriorityPolicy
       >;
@@ -3470,11 +1741,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RequestPriorityPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::ReplyPriorityPolicy
       >;
@@ -3490,11 +1756,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyPriorityPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RequestStartTimePolicy
       >;
@@ -3510,11 +1771,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RequestStartTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RequestEndTimePolicy
       >;
@@ -3530,11 +1786,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RequestEndTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::ReplyStartTimePolicy
       >;
@@ -3550,11 +1801,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyStartTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::ReplyEndTimePolicy
       >;
@@ -3570,11 +1816,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyEndTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RelativeRequestTimeoutPolicy
       >;
@@ -3590,11 +1831,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RelativeRequestTimeoutPolicy
-      >;
-
-  template class
     TAO_Fixed_Var_T<
         Messaging::RoutingTypeRange
       >;
@@ -3605,11 +1841,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        Messaging::RoutingTypeRange
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RoutingPolicy
       >;
@@ -3625,11 +1856,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RoutingPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::MaxHopsPolicy
       >;
@@ -3645,11 +1871,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::MaxHopsPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::QueueOrderPolicy
       >;
@@ -3664,11 +1885,6 @@ CORBA::Boolean operator>> (
         Messaging::QueueOrderPolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::QueueOrderPolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -3687,11 +1903,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RebindPolicy \
-      >
-
-# pragma instantiate \
     TAO_Fixed_Var_T< \
         Messaging::PriorityRange \
       >
@@ -3702,11 +1913,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        Messaging::PriorityRange \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RequestPriorityPolicy \
       >
@@ -3722,11 +1928,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RequestPriorityPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::ReplyPriorityPolicy \
       >
@@ -3742,11 +1943,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyPriorityPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RequestStartTimePolicy \
       >
@@ -3762,11 +1958,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RequestStartTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RequestEndTimePolicy \
       >
@@ -3782,11 +1973,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RequestEndTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::ReplyStartTimePolicy \
       >
@@ -3802,11 +1988,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyStartTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::ReplyEndTimePolicy \
       >
@@ -3822,11 +2003,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyEndTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RelativeRequestTimeoutPolicy \
       >
@@ -3842,11 +2018,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RelativeRequestTimeoutPolicy \
-      >
-
-# pragma instantiate \
     TAO_Fixed_Var_T< \
         Messaging::RoutingTypeRange \
       >
@@ -3857,11 +2028,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        Messaging::RoutingTypeRange \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RoutingPolicy \
       >
@@ -3877,11 +2043,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RoutingPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::MaxHopsPolicy \
       >
@@ -3897,11 +2058,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::MaxHopsPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::QueueOrderPolicy \
       >
@@ -3916,10 +2072,4 @@ CORBA::Boolean operator>> (
         Messaging::QueueOrderPolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::QueueOrderPolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index ae675e406e1..53273c2d1cc 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
 #define _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -67,9 +70,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -78,7 +79,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -95,7 +96,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
@@ -106,7 +107,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short RebindMode;
   typedef CORBA::Short_out RebindMode_out;
@@ -132,7 +133,7 @@ namespace Messaging
   const Messaging::RebindMode NO_RECONNECT = 2;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short RoutingType;
   typedef CORBA::Short_out RoutingType_out;
@@ -158,7 +159,7 @@ namespace Messaging
   const Messaging::RoutingType ROUTE_STORE_AND_FORWARD = 2;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::UShort Ordering;
   typedef CORBA::UShort_out Ordering_out;
@@ -194,7 +195,7 @@ namespace Messaging
   const CORBA::PolicyType REBIND_POLICY_TYPE = 23U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REBINDPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REBINDPOLICY__VAR_OUT_CH_
@@ -223,7 +224,7 @@ namespace Messaging
 #define _MESSAGING_REBINDPOLICY_CH_
   
   class TAO_Messaging_Export RebindPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RebindPolicy_ptr _ptr_type;
@@ -244,7 +245,7 @@ namespace Messaging
     
     static RebindPolicy_ptr _nil (void)
     {
-      return (RebindPolicy_ptr)0;
+      return static_cast<RebindPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -348,7 +349,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityRange;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY__VAR_OUT_CH_
@@ -377,7 +378,7 @@ namespace Messaging
 #define _MESSAGING_REQUESTPRIORITYPOLICY_CH_
   
   class TAO_Messaging_Export RequestPriorityPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestPriorityPolicy_ptr _ptr_type;
@@ -398,7 +399,7 @@ namespace Messaging
     
     static RequestPriorityPolicy_ptr _nil (void)
     {
-      return (RequestPriorityPolicy_ptr)0;
+      return static_cast<RequestPriorityPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -470,7 +471,7 @@ namespace Messaging
   const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY__VAR_OUT_CH_
@@ -499,7 +500,7 @@ namespace Messaging
 #define _MESSAGING_REPLYPRIORITYPOLICY_CH_
   
   class TAO_Messaging_Export ReplyPriorityPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ReplyPriorityPolicy_ptr _ptr_type;
@@ -520,7 +521,7 @@ namespace Messaging
     
     static ReplyPriorityPolicy_ptr _nil (void)
     {
-      return (ReplyPriorityPolicy_ptr)0;
+      return static_cast<ReplyPriorityPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -592,7 +593,7 @@ namespace Messaging
   const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY__VAR_OUT_CH_
@@ -621,7 +622,7 @@ namespace Messaging
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_
   
   class TAO_Messaging_Export RequestStartTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestStartTimePolicy_ptr _ptr_type;
@@ -642,7 +643,7 @@ namespace Messaging
     
     static RequestStartTimePolicy_ptr _nil (void)
     {
-      return (RequestStartTimePolicy_ptr)0;
+      return static_cast<RequestStartTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -714,7 +715,7 @@ namespace Messaging
   const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY__VAR_OUT_CH_
@@ -743,7 +744,7 @@ namespace Messaging
 #define _MESSAGING_REQUESTENDTIMEPOLICY_CH_
   
   class TAO_Messaging_Export RequestEndTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestEndTimePolicy_ptr _ptr_type;
@@ -764,7 +765,7 @@ namespace Messaging
     
     static RequestEndTimePolicy_ptr _nil (void)
     {
-      return (RequestEndTimePolicy_ptr)0;
+      return static_cast<RequestEndTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -836,7 +837,7 @@ namespace Messaging
   const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY__VAR_OUT_CH_
@@ -865,7 +866,7 @@ namespace Messaging
 #define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_
   
   class TAO_Messaging_Export ReplyStartTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ReplyStartTimePolicy_ptr _ptr_type;
@@ -886,7 +887,7 @@ namespace Messaging
     
     static ReplyStartTimePolicy_ptr _nil (void)
     {
-      return (ReplyStartTimePolicy_ptr)0;
+      return static_cast<ReplyStartTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -958,7 +959,7 @@ namespace Messaging
   const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY__VAR_OUT_CH_
@@ -987,7 +988,7 @@ namespace Messaging
 #define _MESSAGING_REPLYENDTIMEPOLICY_CH_
   
   class TAO_Messaging_Export ReplyEndTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ReplyEndTimePolicy_ptr _ptr_type;
@@ -1008,7 +1009,7 @@ namespace Messaging
     
     static ReplyEndTimePolicy_ptr _nil (void)
     {
-      return (ReplyEndTimePolicy_ptr)0;
+      return static_cast<ReplyEndTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1080,7 +1081,7 @@ namespace Messaging
   const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__VAR_OUT_CH_
@@ -1109,7 +1110,7 @@ namespace Messaging
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_
   
   class TAO_Messaging_Export RelativeRequestTimeoutPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
@@ -1130,7 +1131,7 @@ namespace Messaging
     
     static RelativeRequestTimeoutPolicy_ptr _nil (void)
     {
-      return (RelativeRequestTimeoutPolicy_ptr)0;
+      return static_cast<RelativeRequestTimeoutPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1234,7 +1235,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingTypeRange;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_ROUTINGPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_ROUTINGPOLICY__VAR_OUT_CH_
@@ -1263,7 +1264,7 @@ namespace Messaging
 #define _MESSAGING_ROUTINGPOLICY_CH_
   
   class TAO_Messaging_Export RoutingPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RoutingPolicy_ptr _ptr_type;
@@ -1284,7 +1285,7 @@ namespace Messaging
     
     static RoutingPolicy_ptr _nil (void)
     {
-      return (RoutingPolicy_ptr)0;
+      return static_cast<RoutingPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1356,7 +1357,7 @@ namespace Messaging
   const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_MAXHOPSPOLICY__VAR_OUT_CH_
@@ -1385,7 +1386,7 @@ namespace Messaging
 #define _MESSAGING_MAXHOPSPOLICY_CH_
   
   class TAO_Messaging_Export MaxHopsPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef MaxHopsPolicy_ptr _ptr_type;
@@ -1406,7 +1407,7 @@ namespace Messaging
     
     static MaxHopsPolicy_ptr _nil (void)
     {
-      return (MaxHopsPolicy_ptr)0;
+      return static_cast<MaxHopsPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1478,7 +1479,7 @@ namespace Messaging
   const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_QUEUEORDERPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY__VAR_OUT_CH_
@@ -1507,7 +1508,7 @@ namespace Messaging
 #define _MESSAGING_QUEUEORDERPOLICY_CH_
   
   class TAO_Messaging_Export QueueOrderPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef QueueOrderPolicy_ptr _ptr_type;
@@ -1528,7 +1529,7 @@ namespace Messaging
     
     static QueueOrderPolicy_ptr _nil (void)
     {
-      return (QueueOrderPolicy_ptr)0;
+      return static_cast<QueueOrderPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1610,17 +1611,17 @@ namespace TAO
 #define _MESSAGING_REBINDPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RebindPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RebindPolicy>
   {
-    static Messaging::RebindPolicy_ptr duplicate (
-        Messaging::RebindPolicy_ptr
+    static ::Messaging::RebindPolicy_ptr duplicate (
+        ::Messaging::RebindPolicy_ptr
       );
     static void release (
-        Messaging::RebindPolicy_ptr
+        ::Messaging::RebindPolicy_ptr
       );
-    static Messaging::RebindPolicy_ptr nil (void);
+    static ::Messaging::RebindPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RebindPolicy_ptr p,
+        ::Messaging::RebindPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1631,17 +1632,17 @@ namespace TAO
 #define _MESSAGING_REQUESTPRIORITYPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RequestPriorityPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestPriorityPolicy>
   {
-    static Messaging::RequestPriorityPolicy_ptr duplicate (
-        Messaging::RequestPriorityPolicy_ptr
+    static ::Messaging::RequestPriorityPolicy_ptr duplicate (
+        ::Messaging::RequestPriorityPolicy_ptr
       );
     static void release (
-        Messaging::RequestPriorityPolicy_ptr
+        ::Messaging::RequestPriorityPolicy_ptr
       );
-    static Messaging::RequestPriorityPolicy_ptr nil (void);
+    static ::Messaging::RequestPriorityPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RequestPriorityPolicy_ptr p,
+        ::Messaging::RequestPriorityPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1652,17 +1653,17 @@ namespace TAO
 #define _MESSAGING_REPLYPRIORITYPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyPriorityPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyPriorityPolicy>
   {
-    static Messaging::ReplyPriorityPolicy_ptr duplicate (
-        Messaging::ReplyPriorityPolicy_ptr
+    static ::Messaging::ReplyPriorityPolicy_ptr duplicate (
+        ::Messaging::ReplyPriorityPolicy_ptr
       );
     static void release (
-        Messaging::ReplyPriorityPolicy_ptr
+        ::Messaging::ReplyPriorityPolicy_ptr
       );
-    static Messaging::ReplyPriorityPolicy_ptr nil (void);
+    static ::Messaging::ReplyPriorityPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyPriorityPolicy_ptr p,
+        ::Messaging::ReplyPriorityPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1673,17 +1674,17 @@ namespace TAO
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RequestStartTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestStartTimePolicy>
   {
-    static Messaging::RequestStartTimePolicy_ptr duplicate (
-        Messaging::RequestStartTimePolicy_ptr
+    static ::Messaging::RequestStartTimePolicy_ptr duplicate (
+        ::Messaging::RequestStartTimePolicy_ptr
       );
     static void release (
-        Messaging::RequestStartTimePolicy_ptr
+        ::Messaging::RequestStartTimePolicy_ptr
       );
-    static Messaging::RequestStartTimePolicy_ptr nil (void);
+    static ::Messaging::RequestStartTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RequestStartTimePolicy_ptr p,
+        ::Messaging::RequestStartTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1694,17 +1695,17 @@ namespace TAO
 #define _MESSAGING_REQUESTENDTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RequestEndTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestEndTimePolicy>
   {
-    static Messaging::RequestEndTimePolicy_ptr duplicate (
-        Messaging::RequestEndTimePolicy_ptr
+    static ::Messaging::RequestEndTimePolicy_ptr duplicate (
+        ::Messaging::RequestEndTimePolicy_ptr
       );
     static void release (
-        Messaging::RequestEndTimePolicy_ptr
+        ::Messaging::RequestEndTimePolicy_ptr
       );
-    static Messaging::RequestEndTimePolicy_ptr nil (void);
+    static ::Messaging::RequestEndTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RequestEndTimePolicy_ptr p,
+        ::Messaging::RequestEndTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1715,17 +1716,17 @@ namespace TAO
 #define _MESSAGING_REPLYSTARTTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyStartTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyStartTimePolicy>
   {
-    static Messaging::ReplyStartTimePolicy_ptr duplicate (
-        Messaging::ReplyStartTimePolicy_ptr
+    static ::Messaging::ReplyStartTimePolicy_ptr duplicate (
+        ::Messaging::ReplyStartTimePolicy_ptr
       );
     static void release (
-        Messaging::ReplyStartTimePolicy_ptr
+        ::Messaging::ReplyStartTimePolicy_ptr
       );
-    static Messaging::ReplyStartTimePolicy_ptr nil (void);
+    static ::Messaging::ReplyStartTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyStartTimePolicy_ptr p,
+        ::Messaging::ReplyStartTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1736,17 +1737,17 @@ namespace TAO
 #define _MESSAGING_REPLYENDTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyEndTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyEndTimePolicy>
   {
-    static Messaging::ReplyEndTimePolicy_ptr duplicate (
-        Messaging::ReplyEndTimePolicy_ptr
+    static ::Messaging::ReplyEndTimePolicy_ptr duplicate (
+        ::Messaging::ReplyEndTimePolicy_ptr
       );
     static void release (
-        Messaging::ReplyEndTimePolicy_ptr
+        ::Messaging::ReplyEndTimePolicy_ptr
       );
-    static Messaging::ReplyEndTimePolicy_ptr nil (void);
+    static ::Messaging::ReplyEndTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyEndTimePolicy_ptr p,
+        ::Messaging::ReplyEndTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1757,17 +1758,17 @@ namespace TAO
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRequestTimeoutPolicy>
   {
-    static Messaging::RelativeRequestTimeoutPolicy_ptr duplicate (
-        Messaging::RelativeRequestTimeoutPolicy_ptr
+    static ::Messaging::RelativeRequestTimeoutPolicy_ptr duplicate (
+        ::Messaging::RelativeRequestTimeoutPolicy_ptr
       );
     static void release (
-        Messaging::RelativeRequestTimeoutPolicy_ptr
+        ::Messaging::RelativeRequestTimeoutPolicy_ptr
       );
-    static Messaging::RelativeRequestTimeoutPolicy_ptr nil (void);
+    static ::Messaging::RelativeRequestTimeoutPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RelativeRequestTimeoutPolicy_ptr p,
+        ::Messaging::RelativeRequestTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1778,17 +1779,17 @@ namespace TAO
 #define _MESSAGING_ROUTINGPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RoutingPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RoutingPolicy>
   {
-    static Messaging::RoutingPolicy_ptr duplicate (
-        Messaging::RoutingPolicy_ptr
+    static ::Messaging::RoutingPolicy_ptr duplicate (
+        ::Messaging::RoutingPolicy_ptr
       );
     static void release (
-        Messaging::RoutingPolicy_ptr
+        ::Messaging::RoutingPolicy_ptr
       );
-    static Messaging::RoutingPolicy_ptr nil (void);
+    static ::Messaging::RoutingPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RoutingPolicy_ptr p,
+        ::Messaging::RoutingPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1799,17 +1800,17 @@ namespace TAO
 #define _MESSAGING_MAXHOPSPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::MaxHopsPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::MaxHopsPolicy>
   {
-    static Messaging::MaxHopsPolicy_ptr duplicate (
-        Messaging::MaxHopsPolicy_ptr
+    static ::Messaging::MaxHopsPolicy_ptr duplicate (
+        ::Messaging::MaxHopsPolicy_ptr
       );
     static void release (
-        Messaging::MaxHopsPolicy_ptr
+        ::Messaging::MaxHopsPolicy_ptr
       );
-    static Messaging::MaxHopsPolicy_ptr nil (void);
+    static ::Messaging::MaxHopsPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::MaxHopsPolicy_ptr p,
+        ::Messaging::MaxHopsPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1820,17 +1821,17 @@ namespace TAO
 #define _MESSAGING_QUEUEORDERPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::QueueOrderPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::QueueOrderPolicy>
   {
-    static Messaging::QueueOrderPolicy_ptr duplicate (
-        Messaging::QueueOrderPolicy_ptr
+    static ::Messaging::QueueOrderPolicy_ptr duplicate (
+        ::Messaging::QueueOrderPolicy_ptr
       );
     static void release (
-        Messaging::QueueOrderPolicy_ptr
+        ::Messaging::QueueOrderPolicy_ptr
       );
-    static Messaging::QueueOrderPolicy_ptr nil (void);
+    static ::Messaging::QueueOrderPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::QueueOrderPolicy_ptr p,
+        ::Messaging::QueueOrderPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1944,13 +1945,13 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_No_ImplC.i"
+#include "Messaging_No_ImplC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -1962,3 +1963,4 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Routi
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/MessagingS.i b/TAO/tao/Messaging/Messaging_No_ImplC.inl
index 1d2df31bd57..c944d806c1f 100644
--- a/TAO/tao/Messaging/MessagingS.i
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.inl
@@ -24,3 +24,4 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index c627d0f9d9a..371356c65ec 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -28,9 +28,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -82,7 +80,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index 4ef1cfac19a..174bea8630b 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -29,9 +29,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -50,12 +48,10 @@ public:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_MESSAGING_POLICY_FACTORY_H */
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 56bb103fc18..25ee477009e 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -19,9 +19,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -157,7 +155,7 @@ private:
 #include "Messaging_Policy_i.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index a9aa2fd73d3..f8c27c89e00 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -19,18 +19,7 @@
  *        -Wb,post_include="ace/post.h"
  *        Messaging_RT_Policy.pidl
  *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_RT_Policy{C,S,S_T}.{h,i,cpp} .
- *   patch < diffs/Messaging_RT_Policy.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_RT_Policy{C,S,S_T}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_RT_Policy.diff
+ *   The generated files are ready to use
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
new file mode 100644
index 00000000000..135681295de
--- /dev/null
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
@@ -0,0 +1,217 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "Messaging_RT_PolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_Timeout[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5469), 
+  ACE_NTOHL (0x6d656f75), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
+    8,
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x6f757400),  // name = Timeout
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+        6,
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54000000),  // name = TimeT
+        CORBA::tk_ulonglong,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (
+    CORBA::tk_alias,
+    sizeof (_oc_Messaging_Timeout),
+    (char *) &_oc_Messaging_Timeout,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_Timeout =
+    &_tc_TAO_tc_Messaging_Timeout;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  57,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x6c617469), 
+  ACE_NTOHL (0x7665526f), 
+  ACE_NTOHL (0x756e6474), 
+  ACE_NTOHL (0x72697054), 
+  ACE_NTOHL (0x696d656f), 
+  ACE_NTOHL (0x7574506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0
+    31,
+  ACE_NTOHL (0x52656c61), 
+  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x526f756e), 
+  ACE_NTOHL (0x64747269), 
+  ACE_NTOHL (0x7054696d), 
+  ACE_NTOHL (0x656f7574), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy),
+    (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy =
+    &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::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<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_elem
+  )
+{
+  Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_objptr =
+    Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::insert (
+      _tao_any,
+      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
+      Messaging::_tc_RelativeRoundtripTimeoutPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::extract (
+        _tao_any,
+        Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
+        Messaging::_tc_RelativeRoundtripTimeoutPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::RelativeRoundtripTimeoutPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::RelativeRoundtripTimeoutPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index 0dc6d2c6603..596fb1f9885 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_RT_PolicyC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_RT_PolicyC.i"
+#include "Messaging_RT_PolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -53,59 +51,6 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_Timeout[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
-    8,
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x6f757400),  // name = Timeout
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Timeout),
-    (char *) &_oc_Messaging_Timeout,
-    0,
-    sizeof (Messaging::Timeout)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_Timeout =
-    &_tc_TAO_tc_Messaging_Timeout;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RelativeRoundtripTimeoutPolicy.
@@ -145,12 +90,6 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RelativeRoundtripTimeoutPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
 {}
 
@@ -161,7 +100,7 @@ void
 Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RelativeRoundtripTimeoutPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RelativeRoundtripTimeoutPolicy *, _tao_void_pointer);
+    static_cast<RelativeRoundtripTimeoutPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -218,22 +157,22 @@ Messaging::RelativeRoundtripTimeoutPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -255,123 +194,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x7665526f), 
-  ACE_NTOHL (0x756e6474), 
-  ACE_NTOHL (0x72697054), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0
-    31,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x526f756e), 
-  ACE_NTOHL (0x64747269), 
-  ACE_NTOHL (0x7054696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy),
-    (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy,
-    0,
-    sizeof (Messaging::RelativeRoundtripTimeoutPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy =
-    &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::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<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_objptr =
-    Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::insert (
-      _tao_any,
-      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
-      Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::extract (
-        _tao_any,
-        Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
-        Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -390,11 +213,6 @@ operator>>= (
         Messaging::RelativeRoundtripTimeoutPolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::RelativeRoundtripTimeoutPolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -412,10 +230,4 @@ operator>>= (
         Messaging::RelativeRoundtripTimeoutPolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RelativeRoundtripTimeoutPolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 77d5c0fbe8a..56b2d500918 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
 #define _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -88,7 +89,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef TimeBase::TimeT Timeout;
   typedef TimeBase::TimeT_out Timeout_out;
@@ -104,7 +105,7 @@ namespace Messaging
   const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_
@@ -133,7 +134,7 @@ namespace Messaging
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_
   
   class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type;
@@ -154,7 +155,7 @@ namespace Messaging
     
     static RelativeRoundtripTimeoutPolicy_ptr _nil (void)
     {
-      return (RelativeRoundtripTimeoutPolicy_ptr)0;
+      return static_cast<RelativeRoundtripTimeoutPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -236,17 +237,17 @@ namespace TAO
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRoundtripTimeoutPolicy>
   {
-    static Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate (
-        Messaging::RelativeRoundtripTimeoutPolicy_ptr
+    static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate (
+        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
       );
     static void release (
-        Messaging::RelativeRoundtripTimeoutPolicy_ptr
+        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
       );
-    static Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void);
+    static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
+        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -262,13 +263,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtri
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_RT_PolicyC.i"
+#include "Messaging_RT_PolicyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -280,3 +281,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i b/TAO/tao/Messaging/Messaging_RT_PolicyC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 469e8d1f9ac..1a1eabdcaaf 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -19,18 +19,7 @@
  *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
  *        Messaging_SyncScope_Policy.pidl
  *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_SyncScope_Policy{C,S}.{h,i,cpp} .
- *   patch < diffs/Messaging_SyncScope_Policy.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_SyncScope_Policy{C,S}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_SyncScope_Policy.diff
+ *   The generated files are ready to use
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
new file mode 100644
index 00000000000..5674bd499d7
--- /dev/null
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
@@ -0,0 +1,156 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "Messaging_SyncScope_PolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5379), 
+  ACE_NTOHL (0x6e635363), 
+  ACE_NTOHL (0x6f706550), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/SyncScopePolicy:1.0
+    16,
+  ACE_NTOHL (0x53796e63), 
+  ACE_NTOHL (0x53636f70), 
+  ACE_NTOHL (0x65506f6c), 
+  ACE_NTOHL (0x69637900),  // name = SyncScopePolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_Messaging_SyncScopePolicy),
+    (char *) &_oc_Messaging_SyncScopePolicy,
+    0,
+    0
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_SyncScopePolicy =
+    &_tc_TAO_tc_Messaging_SyncScopePolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::SyncScopePolicy>::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<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::SyncScopePolicy_ptr _tao_elem
+  )
+{
+  Messaging::SyncScopePolicy_ptr _tao_objptr =
+    Messaging::SyncScopePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::SyncScopePolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::SyncScopePolicy>::insert (
+      _tao_any,
+      Messaging::SyncScopePolicy::_tao_any_destructor,
+      Messaging::_tc_SyncScopePolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::SyncScopePolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::SyncScopePolicy>::extract (
+        _tao_any,
+        Messaging::SyncScopePolicy::_tao_any_destructor,
+        Messaging::_tc_SyncScopePolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        Messaging::SyncScopePolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        Messaging::SyncScopePolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index 2258328fd35..698b46a7e97 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_SyncScope_PolicyC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_SyncScope_PolicyC.i"
+#include "Messaging_SyncScope_PolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -92,12 +90,6 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_SyncScopePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::SyncScopePolicy::SyncScopePolicy (void)
 {}
 
@@ -108,7 +100,7 @@ void
 Messaging::SyncScopePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SyncScopePolicy *_tao_tmp_pointer =
-    ACE_static_cast (SyncScopePolicy *, _tao_void_pointer);
+    static_cast<SyncScopePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -165,22 +157,22 @@ Messaging::SyncScopePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/SyncScopePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -202,115 +194,7 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5379), 
-  ACE_NTOHL (0x6e635363), 
-  ACE_NTOHL (0x6f706550), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/SyncScopePolicy:1.0
-    16,
-  ACE_NTOHL (0x53796e63), 
-  ACE_NTOHL (0x53636f70), 
-  ACE_NTOHL (0x65506f6c), 
-  ACE_NTOHL (0x69637900),  // name = SyncScopePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_SyncScopePolicy),
-    (char *) &_oc_Messaging_SyncScopePolicy,
-    0,
-    sizeof (Messaging::SyncScopePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_SyncScopePolicy =
-    &_tc_TAO_tc_Messaging_SyncScopePolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::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<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr _tao_elem
-  )
-{
-  Messaging::SyncScopePolicy_ptr _tao_objptr =
-    Messaging::SyncScopePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::SyncScopePolicy>::insert (
-      _tao_any,
-      Messaging::SyncScopePolicy::_tao_any_destructor,
-      Messaging::_tc_SyncScopePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::SyncScopePolicy>::extract (
-        _tao_any,
-        Messaging::SyncScopePolicy::_tao_any_destructor,
-        Messaging::_tc_SyncScopePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -329,11 +213,6 @@ operator>>= (
         Messaging::SyncScopePolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::SyncScopePolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -351,10 +230,4 @@ operator>>= (
         Messaging::SyncScopePolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::SyncScopePolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index bfd072dec95..7857451adc5 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -93,7 +94,7 @@ namespace Messaging
   const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY__VAR_OUT_CH_
@@ -122,7 +123,7 @@ namespace Messaging
 #define _MESSAGING_SYNCSCOPEPOLICY_CH_
   
   class TAO_Messaging_Export SyncScopePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef SyncScopePolicy_ptr _ptr_type;
@@ -143,7 +144,7 @@ namespace Messaging
     
     static SyncScopePolicy_ptr _nil (void)
     {
-      return (SyncScopePolicy_ptr)0;
+      return static_cast<SyncScopePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -225,17 +226,17 @@ namespace TAO
 #define _MESSAGING_SYNCSCOPEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::SyncScopePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::SyncScopePolicy>
   {
-    static Messaging::SyncScopePolicy_ptr duplicate (
-        Messaging::SyncScopePolicy_ptr
+    static ::Messaging::SyncScopePolicy_ptr duplicate (
+        ::Messaging::SyncScopePolicy_ptr
       );
     static void release (
-        Messaging::SyncScopePolicy_ptr
+        ::Messaging::SyncScopePolicy_ptr
       );
-    static Messaging::SyncScopePolicy_ptr nil (void);
+    static ::Messaging::SyncScopePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::SyncScopePolicy_ptr p,
+        ::Messaging::SyncScopePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -251,13 +252,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_SyncScope_PolicyC.i"
+#include "Messaging_SyncScope_PolicyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -269,3 +270,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.i b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.i
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
index 526fd11d520..a70a56b4232 100644
--- a/TAO/tao/Messaging/TAO_Ext.pidl
+++ b/TAO/tao/Messaging/TAO_Ext.pidl
@@ -20,21 +20,9 @@
  *       -Wb,export_include=messaging_export.h
  *       -Wb,pre_include="ace/pre.h"
  *       -Wb,post_include="ace/post.h"
- *       -Wb,export_include="tao/corbafwd.h" -I$(TAO_ROOT) TAO_Ext.pidl
+ *       -I$(TAO_ROOT) TAO_Ext.pidl
  *
- *   2. Then patch the generated code.  The patch fixes the interface
- *   repository IDs, disables the code under certain configurations,
- *   and eliminates cycles in the include dependencies.
- *
- *   Apply patches using the following commands:
- *
- *   patch < diffs/TAO_ExtC.diff
- *
- *   @note The diffs were generated with these commands:
- *
- *   for i in TAO_ExtC{C,S}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/TAO_ExtC.diff
+ *   The generated files are ready to use
  */
 // ================================================================
 
diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp
new file mode 100644
index 00000000000..eba90d78233
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_ExtA.cpp
@@ -0,0 +1,157 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "TAO_ExtC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x436f6e6e), 
+  ACE_NTOHL (0x65637469), 
+  ACE_NTOHL (0x6f6e5469), 
+  ACE_NTOHL (0x6d656f75), 
+  ACE_NTOHL (0x74506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0
+    24,
+  ACE_NTOHL (0x436f6e6e), 
+  ACE_NTOHL (0x65637469), 
+  ACE_NTOHL (0x6f6e5469), 
+  ACE_NTOHL (0x6d656f75), 
+  ACE_NTOHL (0x74506f6c), 
+  ACE_NTOHL (0x69637900),  // name = ConnectionTimeoutPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_ConnectionTimeoutPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_ConnectionTimeoutPolicy),
+    (char *) &_oc_TAO_ConnectionTimeoutPolicy,
+    0,
+    0
+  );
+
+namespace TAO
+{
+  ::CORBA::TypeCode_ptr _tc_ConnectionTimeoutPolicy =
+    &_tc_TAO_tc_TAO_ConnectionTimeoutPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::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<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::ConnectionTimeoutPolicy_ptr _tao_elem
+  )
+{
+  TAO::ConnectionTimeoutPolicy_ptr _tao_objptr =
+    TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::ConnectionTimeoutPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::insert (
+      _tao_any,
+      TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
+      TAO::_tc_ConnectionTimeoutPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO::ConnectionTimeoutPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::extract (
+        _tao_any,
+        TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
+        TAO::_tc_ConnectionTimeoutPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        TAO::ConnectionTimeoutPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        TAO::ConnectionTimeoutPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index 0f031d2aa95..0c016867048 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "TAO_ExtC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "TAO_ExtC.i"
+#include "TAO_ExtC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -92,12 +90,6 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*TAO__TAO_ConnectionTimeoutPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
 {}
 
@@ -108,7 +100,7 @@ void
 TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConnectionTimeoutPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ConnectionTimeoutPolicy *, _tao_void_pointer);
+    static_cast<ConnectionTimeoutPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -165,22 +157,22 @@ TAO::ConnectionTimeoutPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -202,116 +194,7 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x436f6e6e), 
-  ACE_NTOHL (0x65637469), 
-  ACE_NTOHL (0x6f6e5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x74506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0
-    24,
-  ACE_NTOHL (0x436f6e6e), 
-  ACE_NTOHL (0x65637469), 
-  ACE_NTOHL (0x6f6e5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x74506f6c), 
-  ACE_NTOHL (0x69637900),  // name = ConnectionTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_ConnectionTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_TAO_ConnectionTimeoutPolicy),
-    (char *) &_oc_TAO_ConnectionTimeoutPolicy,
-    0,
-    sizeof (TAO::ConnectionTimeoutPolicy)
-  );
-
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr _tc_ConnectionTimeoutPolicy =
-    &_tc_TAO_tc_TAO_ConnectionTimeoutPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::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<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr _tao_elem
-  )
-{
-  TAO::ConnectionTimeoutPolicy_ptr _tao_objptr =
-    TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::insert (
-      _tao_any,
-      TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
-      TAO::_tc_ConnectionTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::extract (
-        _tao_any,
-        TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
-        TAO::_tc_ConnectionTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -330,11 +213,6 @@ operator>>= (
         TAO::ConnectionTimeoutPolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        TAO::ConnectionTimeoutPolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -352,10 +230,4 @@ operator>>= (
         TAO::ConnectionTimeoutPolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        TAO::ConnectionTimeoutPolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index 738074f3f37..b56aa9d341f 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_TAO_EXTC_H_
 #define _TAO_IDL_ORIG_TAO_EXTC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -93,7 +94,7 @@ namespace TAO
   const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 1413545992U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY__VAR_OUT_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY__VAR_OUT_CH_
@@ -122,7 +123,7 @@ namespace TAO
 #define _TAO_CONNECTIONTIMEOUTPOLICY_CH_
   
   class TAO_Messaging_Export ConnectionTimeoutPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ConnectionTimeoutPolicy_ptr _ptr_type;
@@ -143,7 +144,7 @@ namespace TAO
     
     static ConnectionTimeoutPolicy_ptr _nil (void)
     {
-      return (ConnectionTimeoutPolicy_ptr)0;
+      return static_cast<ConnectionTimeoutPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -225,17 +226,17 @@ namespace TAO
 #define _TAO_CONNECTIONTIMEOUTPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<TAO::ConnectionTimeoutPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::TAO::ConnectionTimeoutPolicy>
   {
-    static TAO::ConnectionTimeoutPolicy_ptr duplicate (
-        TAO::ConnectionTimeoutPolicy_ptr
+    static ::TAO::ConnectionTimeoutPolicy_ptr duplicate (
+        ::TAO::ConnectionTimeoutPolicy_ptr
       );
     static void release (
-        TAO::ConnectionTimeoutPolicy_ptr
+        ::TAO::ConnectionTimeoutPolicy_ptr
       );
-    static TAO::ConnectionTimeoutPolicy_ptr nil (void);
+    static ::TAO::ConnectionTimeoutPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO::ConnectionTimeoutPolicy_ptr p,
+        ::TAO::ConnectionTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -251,13 +252,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolic
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "TAO_ExtC.i"
+#include "TAO_ExtC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -269,3 +270,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::Connec
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/TAO_ExtC.i b/TAO/tao/Messaging/TAO_ExtC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging/TAO_ExtC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       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
-
-
diff --git a/TAO/tao/Messaging/TAO_ExtC.inl b/TAO/tao/Messaging/TAO_ExtC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_ExtC.inl
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 2993198aadb..5774394ccd6 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,152 +1,35 @@
---- orig/MessagingC.h	Wed Sep  4 19:44:07 2002
-+++ MessagingC.h	Wed Sep  4 19:40:25 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+--- orig/MessagingC.h	2005-02-07 11:55:22.321433600 +0100
++++ MessagingC.h	2005-02-07 11:52:07.681555200 +0100
+@@ -36,6 +36,10 @@
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -27,7 +27,12 @@
- #define _TAO_IDL_ORIG_MESSAGINGC_H_
+ #include "ace/config-all.h"
  
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+
-+#ifndef TAO_MESSAGING_SAFE_INCLUDE 
++#ifndef TAO_MESSAGING_SAFE_INCLUDE
 +#error "You should not include MessagingC.h directly, use Messaging.h"
 +#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
 +
- 
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
-@@ -37,6 +42,9 @@
- #include "Messaging_SyncScope_PolicyC.h"
- #include "Messaging_RT_PolicyC.h"
- #include "Messaging_No_ImplC.h"
-+#include "tao/ValueBase.h"
-+#include "tao/ValueFactory.h"
-+
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -682,6 +690,7 @@
- #if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
- #define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
- 
-+#if 0
- TAO_Messaging_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
-     const Messaging::ExceptionHolder::_tao_seq_Octet &
-@@ -691,6 +700,8 @@
-     Messaging::ExceptionHolder::_tao_seq_Octet &
-   );
- 
-+#endif /*if 0*/
-+
- #endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */
- 
- 
---- orig/MessagingC.i	Wed Sep  4 19:44:07 2002
-+++ MessagingC.i	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingC.cpp	Wed Sep  4 19:44:07 2002
-+++ MessagingC.cpp	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+--- orig/MessagingC.cpp	2005-02-07 11:55:22.321433600 +0100
++++ MessagingC.cpp	2005-02-07 11:52:41.349968000 +0100
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:302
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -23,7 +23,7 @@
- // TAO_IDL - Generated from
- // be/be_codegen.cpp:315
  
 -#include "MessagingC.h"
 +#include "Messaging.h"
+ #include "tao/CDR.h"
+ #include "tao/Object_T.h"
+ #include "tao/ORB_Core.h"
+--- orig/MessagingA.cpp	2005-02-07 11:55:22.321433600 +0100
++++ MessagingA.cpp	2005-02-07 12:00:18.076708800 +0100
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
---- orig/MessagingS.h	Wed Sep  4 19:44:07 2002
-+++ MessagingS.h	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -27,10 +27,7 @@
- #define _TAO_IDL_ORIG_MESSAGINGS_H_
- 
- #include "ace/pre.h"
--#include "Messaging_SyncScope_PolicyS.h"
--#include "Messaging_RT_PolicyS.h"
--#include "Messaging_No_ImplS.h"
 -#include "MessagingC.h"
 +#include "Messaging.h"
- 
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
---- orig/MessagingS.i	Wed Sep  4 19:44:07 2002
-+++ MessagingS.i	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS.cpp	Wed Sep  4 19:44:07 2002
-+++ MessagingS.cpp	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS_T.h	Wed Sep  4 19:44:07 2002
-+++ MessagingS_T.h	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS_T.i	Wed Sep  4 19:44:07 2002
-+++ MessagingS_T.i	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS_T.cpp	Wed Sep  4 19:44:07 2002
-+++ MessagingS_T.cpp	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"
diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
index 4a462ef74b8..9a3fa46b6eb 100644
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
@@ -1,6 +1,6 @@
---- orig/Messaging_No_ImplC.h	2003-11-03 21:07:08.000000000 -0600
-+++ Messaging_No_ImplC.h	2003-11-03 21:08:32.000000000 -0600
-@@ -50,6 +50,11 @@
+--- orig/Messaging_No_ImplC.h	2005-02-07 11:50:46.665059200 +0100
++++ Messaging_No_ImplC.h	2005-02-07 11:53:22.098561600 +0100
+@@ -52,6 +52,11 @@
  #include "tao/PolicyC.h"
  #include "tao/PollableC.h"