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

6 files changed, 63 insertions, 112 deletions

diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
index 02de5e46125..e4e4ca12e98 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -26,58 +26,39 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "AdapterActivatorC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f41), 
-  ACE_NTOHL (0x64617074), 
-  ACE_NTOHL (0x65724163), 
-  ACE_NTOHL (0x74697661), 
-  ACE_NTOHL (0x746f723a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/AdapterActivator:2.3
-    17,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657241), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x61746f72), 
-  ACE_NTOHL (0x0),  // name = AdapterActivator
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_AdapterActivator),
-    (char *) &_oc_PortableServer_AdapterActivator,
-    0,
-    0
-  );
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_AdapterActivator (
+    "IDL:omg.org/PortableServer/AdapterActivator:2.3",
+    "AdapterActivator");
 
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_AdapterActivator =
-    &_tc_TAO_tc_PortableServer_AdapterActivator;
+    &_tao_tc_PortableServer_AdapterActivator;
 }
 
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::AdapterActivator>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -87,14 +68,14 @@ TAO::Any_Impl_T<PortableServer::AdapterActivator>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
 {
@@ -157,6 +138,6 @@ operator>>= (
         PortableServer::AdapterActivator \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
index 66c8422229d..b7458c034a1 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -194,7 +194,7 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
index 3b666219959..d8d84922a9b 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.h
+++ b/TAO/tao/PortableServer/AdapterActivatorC.h
@@ -234,7 +234,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "AdapterActivatorC.inl"
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
index 917483a97e8..12401bfa929 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -26,17 +26,47 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ForwardRequestC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_ForwardRequest[] =
+  {
+    { "forward_reference", &CORBA::_tc_Object }
+    
+  };
+
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_ForwardRequest (
+    "IDL:omg.org/PortableServer/ForwardRequest:2.3",
+    "ForwardRequest",
+    _tao_fields_PortableServer_ForwardRequest,
+    1);
+  
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
+    &_tao_tc_PortableServer_ForwardRequest;
+}
+
+
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::demarshal_value (
     TAO_InputCDR & cdr
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
index fb9e4cfbc96..bb606a8a0c1 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -31,7 +31,10 @@
 
 #include "ForwardRequestC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
@@ -172,75 +175,12 @@ PortableServer::ForwardRequest::ForwardRequest (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
+CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
 {
   return ::PortableServer::_tc_ForwardRequest;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f46), 
-  ACE_NTOHL (0x6f727761), 
-  ACE_NTOHL (0x72645265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x743a322e), 
-  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:2.3
-    15,
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73740000),  // name = ForwardRequest
-  1, // member count
-    18,
-  ACE_NTOHL (0x666f7277), 
-  ACE_NTOHL (0x6172645f), 
-  ACE_NTOHL (0x72656665), 
-  ACE_NTOHL (0x72656e63), 
-  ACE_NTOHL (0x65000000),  // name = forward_reference
-    CORBA::tk_objref,
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f62), 
-    ACE_NTOHL (0x6a656374), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-        7,
-    ACE_NTOHL (0x4f626a65), 
-    ACE_NTOHL (0x63740000),  // name = Object
-    
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_ForwardRequest),
-    (char *) &_oc_PortableServer_ForwardRequest,
-    0,
-    0
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
-    &_tc_TAO_tc_PortableServer_ForwardRequest;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
@@ -274,7 +214,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
index 7d24f188b8a..e73732b3777 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.h
+++ b/TAO/tao/PortableServer/ForwardRequestC.h
@@ -122,7 +122,7 @@ namespace PortableServer
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
     
-    virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
@@ -160,7 +160,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Port
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */