*** empty log message ***

12 files changed, 346 insertions, 84 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index bf0e91b1081..1ddc33f3005 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,31 @@
+Fri Nov 13 16:59:20 EST 1998  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
+
+	* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+
+	  We now generate the size information for the typecodes by passing
+	  the compiled time knowledge of the size of the data type and
+	  storing it in the typecode. This will (hopefully) solve our
+	  problems of trying to calculate the size of complex data
+	  structures in an interpreted manner.
+
+	* tao/Any.cpp
+	  tao/DynAnyC.cpp
+	  tao/Exception.cpp
+	  tao/ORB.cpp
+	  tao/Object_KeyC.cpp
+	  tao/POAC.cpp
+	  tao/TypeCode.{h, cpp}
+	  tao/Typecode_Constants.cpp
+	  tao/decode.cpp:
+
+	  The TypeCode constructor for complex types now takes an
+	  additional parameter which is the size in bytes of the data
+	  type. This statically known value is stored in the private_tc_
+	  section of the TypeCode. This will save us the size calculation
+	  using the code in IIOP_Interpreter.cpp. Once we have verified
+	  that everything works fine, we can start cleaning up the
+	  unwanted code from IIOP_Interpreter.* files.
+
 Fri Nov 13 15:09:58 1998  David L. Levine  <levine@cs.wustl.edu>
 
         * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp (svc):
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 6c017da35f0..82f767c5b34 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -140,7 +140,7 @@ be_visitor_typecode_defn::visit_type (be_type *node)
 
   *os << ", sizeof (_oc_" <<  node->flatname ()
       << "), (char *) &_oc_" << node->flatname ()
-      << ", 0);" << be_nl;
+      << ", 0, sizeof (" << node->name () << "));" << be_nl;
 
   // is our enclosing scope a module? We need this check because for
   // platforms that support namespaces, the typecode must be declared
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 37aca1ea1ce..2b8eb1862ad 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -317,7 +317,8 @@ CORBA_Any::operator<<= (from_string s)
       ACE_NEW (tc, CORBA::TypeCode (CORBA::tk_string,
                                     sizeof _oc_string,
                                     (char *) &_oc_string,
-                                    1));
+                                    1,
+                                    sizeof (CORBA::String_var)));
     }
   else
     tc = CORBA::_tc_string; // unbounded.
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
index 503c2fa3b1a..9648c8f669d 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -136,7 +136,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynAny_Invalid (
     CORBA::tk_except,
     sizeof (_oc_CORBA_DynAny_Invalid),
     (char *) &_oc_CORBA_DynAny_Invalid,
-    0
+    0,
+    sizeof (CORBA_DynAny::Invalid)
   );
 
 CORBA::TypeCode_ptr CORBA_DynAny::_tc_Invalid =
@@ -219,7 +220,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynAny_InvalidValue (
     CORBA::tk_except,
     sizeof (_oc_CORBA_DynAny_InvalidValue),
     (char *) &_oc_CORBA_DynAny_InvalidValue,
-    0
+    0,
+    sizeof (CORBA_DynAny::InvalidValue)
   );
 
 CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidValue =
@@ -301,7 +303,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynAny_TypeMismatch (
     CORBA::tk_except,
     sizeof (_oc_CORBA_DynAny_TypeMismatch),
     (char *) &_oc_CORBA_DynAny_TypeMismatch,
-    0
+    0,
+    sizeof (CORBA_DynAny::TypeMismatch)
   );
 
 CORBA::TypeCode_ptr CORBA_DynAny::_tc_TypeMismatch =
@@ -382,7 +385,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynAny_InvalidSeq (
     CORBA::tk_except,
     sizeof (_oc_CORBA_DynAny_InvalidSeq),
     (char *) &_oc_CORBA_DynAny_InvalidSeq,
-    0
+    0,
+    sizeof (CORBA_DynAny::InvalidSeq)
   );
 
 CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidSeq =
@@ -678,7 +682,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynAny (
     CORBA::tk_objref,
     sizeof (_oc_CORBA_DynAny),
     (char *) &_oc_CORBA_DynAny,
-    0
+    0,
+    sizeof (CORBA_DynAny)
   );
 
 CORBA::TypeCode_ptr _tc_CORBA_DynAny = &_tc__tc_CORBA_DynAny;
@@ -782,7 +787,8 @@ static const CORBA::Long _oc_CORBA_DynEnum[] =
 static CORBA::TypeCode _tc__tc_CORBA_DynEnum (CORBA::tk_objref,
                                               sizeof (_oc_CORBA_DynEnum),
                                               (char *) &_oc_CORBA_DynEnum,
-                                              0);
+                                              0,
+                                              sizeof (CORBA_DynEnum));
 
 CORBA::TypeCode_ptr _tc_CORBA_DynEnum = &_tc__tc_CORBA_DynEnum;
 
@@ -805,7 +811,8 @@ static const CORBA::Long _oc_FieldName[] =
 static CORBA::TypeCode _tc__tc_FieldName (CORBA::tk_alias,
                                           sizeof (_oc_FieldName),
                                           (char *) &_oc_FieldName,
-                                          0);
+                                          0,
+                                          sizeof (FieldName));
 
 CORBA::TypeCode_ptr _tc_FieldName = &_tc__tc_FieldName;
 
@@ -851,7 +858,8 @@ static const CORBA::Long _oc_NameValuePair[] =
 static CORBA::TypeCode _tc__tc_NameValuePair (CORBA::tk_struct,
                                               sizeof (_oc_NameValuePair),
                                               (char *) &_oc_NameValuePair,
-                                              0);
+                                              0,
+                                              sizeof (NameValuePair));
 
 CORBA::TypeCode_ptr _tc_NameValuePair = &_tc__tc_NameValuePair;
 
@@ -970,8 +978,8 @@ static CORBA::TypeCode _tc__tc_NameValuePairSeq (
     CORBA::tk_alias,
     sizeof (_oc_NameValuePairSeq),
     (char *) &_oc_NameValuePairSeq,
-    0
-  );
+    0,
+    sizeof (NameValuePairSeq));
 
 CORBA::TypeCode_ptr _tc_NameValuePairSeq = &_tc__tc_NameValuePairSeq;
 
@@ -1078,8 +1086,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynStruct (
     CORBA::tk_objref,
     sizeof (_oc_CORBA_DynStruct),
     (char *) &_oc_CORBA_DynStruct,
-    0
-  );
+    0,
+    sizeof (CORBA_DynStruct));
 
 CORBA::TypeCode_ptr _tc_CORBA_DynStruct = &_tc__tc_CORBA_DynStruct;
 
@@ -1211,8 +1219,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynUnion (
     CORBA::tk_objref,
     sizeof (_oc_CORBA_DynUnion),
     (char *) &_oc_CORBA_DynUnion,
-    0
-  );
+    0,
+    sizeof (CORBA_DynUnion));
 
 CORBA::TypeCode_ptr _tc_CORBA_DynUnion = &_tc__tc_CORBA_DynUnion;
 
@@ -1286,7 +1294,8 @@ static const CORBA::Long _oc_AnySeq[] =
 static CORBA::TypeCode _tc__tc_AnySeq (CORBA::tk_alias,
                                        sizeof (_oc_AnySeq),
                                        (char *) &_oc_AnySeq,
-                                       0);
+                                       0,
+                                       sizeof (AnySeq));
 
 CORBA::TypeCode_ptr _tc_AnySeq = &_tc__tc_AnySeq;
 
@@ -1395,8 +1404,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynSequence (
     CORBA::tk_objref,
     sizeof (_oc_CORBA_DynSequence),
     (char *) &_oc_CORBA_DynSequence,
-    0
-  );
+    0,
+    sizeof (CORBA_DynSequence));
 
 CORBA::TypeCode_ptr _tc_CORBA_DynSequence =
   &_tc__tc_CORBA_DynSequence;
@@ -1491,8 +1500,8 @@ static CORBA::TypeCode _tc__tc_CORBA_DynArray (
     CORBA::tk_objref,
     sizeof (_oc_CORBA_DynArray),
     (char *) &_oc_CORBA_DynArray,
-    0
-  );
+    0,
+    sizeof (CORBA_DynArray));
 
 CORBA::TypeCode_ptr _tc_CORBA_DynArray =
     &_tc__tc_CORBA_DynArray;
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index eeacbac7b6d..3d4e18e06b2 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -288,7 +288,8 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
   tcp = new CORBA::TypeCode (CORBA::tk_except,
                              stream.length (),
                              stream.buffer (),
-                             1);
+                             1,
+                             sizeof (CORBA_UserException));
 }
 
 void
@@ -358,7 +359,8 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
   tcp = new CORBA::TypeCode (CORBA::tk_except,
                              stream.length (),
                              stream.buffer (),
-                             1);
+                             1,
+                             sizeof (CORBA_SystemException));
   
   TAO_Exceptions::system_exceptions->add (tcp);
   assert (tcp->length_ <= TAO_Exceptions::TC_BUFLEN);
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 087f7300e14..1bcc85b6216 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -73,8 +73,8 @@ static CORBA::TypeCode _tc__tc_CORBA_ORB_InconsistentTypeCode (
     CORBA::tk_except, 
     sizeof (_oc_CORBA_ORB_InconsistentTypeCode), 
     (char *) &_oc_CORBA_ORB_InconsistentTypeCode, 
-    0
-  );
+    0,
+    sizeof (CORBA_ORB_InconsistentTypeCode));
 
 // Static initialization.
 int CORBA_ORB::orb_init_count_ = 0;
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index e33293f1039..a1076771624 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -25,7 +25,10 @@ const CORBA::Long _oc_TAO__tao_seq_Octet[] =
 
   0,
 };
-CORBA::TypeCode _tc__tc_TAO__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_TAO__tao_seq_Octet), (char *) &_oc_TAO__tao_seq_Octet, 0);
+CORBA::TypeCode _tc__tc_TAO__tao_seq_Octet (CORBA::tk_sequence, sizeof
+                                            (_oc_TAO__tao_seq_Octet), (char *)
+                                            &_oc_TAO__tao_seq_Octet, 0,
+                                            sizeof (TAO_tao_seq_Octet));
 CORBA::TypeCode_ptr TAO_tc__tao_seq_Octet = &_tc__tc_TAO__tao_seq_Octet;
 
 
@@ -43,6 +46,9 @@ const CORBA::Long _oc_TAO_ObjectKey[] =
 
   0,
 };
-CORBA::TypeCode _tc__tc_TAO_ObjectKey (CORBA::tk_alias, sizeof (_oc_TAO_ObjectKey), (char *) &_oc_TAO_ObjectKey, 0);
+CORBA::TypeCode _tc__tc_TAO_ObjectKey (CORBA::tk_alias, sizeof
+                                       (_oc_TAO_ObjectKey), (char *)
+                                       &_oc_TAO_ObjectKey, 0,
+                                       sizeof (TAO_ObjectKey));
 CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc__tc_TAO_ObjectKey;
 
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index d53d1835360..476eb7b8b92 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -29,11 +29,13 @@ static const CORBA::Long _oc_PortableServer__tao_seq_Octet[] =
 
   0,
 };
-static CORBA::TypeCode _tc__tc_PortableServer__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Octet), (char *) &_oc_PortableServer__tao_seq_Octet, 0);
+static CORBA::TypeCode _tc__tc_PortableServer__tao_seq_Octet
+(CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Octet), (char *)
+ &_oc_PortableServer__tao_seq_Octet, 0, sizeof (PortableServer::_tao_seq_Octet));
 CORBA::TypeCode_ptr PortableServer::_tc__tao_seq_Octet = &_tc__tc_PortableServer__tao_seq_Octet;
 
 
-#endif // end #if !defined
+#endif /* end #if !defined */
 
 static const CORBA::Long _oc_PortableServer_ObjectId[] =
 {
@@ -47,7 +49,9 @@ static const CORBA::Long _oc_PortableServer_ObjectId[] =
 
   0,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof
+                                                        (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId, 
+                                                        0, sizeof (PortableServer::ObjectId));
 CORBA::TypeCode_ptr PortableServer::_tc_ObjectId = &_tc__tc_PortableServer_ObjectId;
 
 // default constructor
@@ -156,7 +160,12 @@ static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
   21, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Object:1.0
   7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x637400fd),  // name = Object,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ForwardRequest (CORBA::tk_except, sizeof (_oc_PortableServer_ForwardRequest), (char *) &_oc_PortableServer_ForwardRequest, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ForwardRequest (CORBA::tk_except,
+                                                              sizeof
+                                                              (_oc_PortableServer_ForwardRequest), 
+                                                              (char *)
+                                                              &_oc_PortableServer_ForwardRequest, 0, 
+                                                              sizeof (PortableServer::ForwardRequest)); 
 CORBA::TypeCode_ptr PortableServer::_tc_ForwardRequest = &_tc__tc_PortableServer_ForwardRequest;
 
 
@@ -169,7 +178,10 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
   15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c00fd),  // name = ORB_CTRL_MODEL
   20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ThreadPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ThreadPolicyValue), (char *) &_oc_PortableServer_ThreadPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ThreadPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ThreadPolicyValue), (char *)
+ &_oc_PortableServer_ThreadPolicyValue, 0,
+ sizeof (PortableServer::ThreadPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicyValue = &_tc__tc_PortableServer_ThreadPolicyValue;
 
 PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (PortableServer::ThreadPolicy_ptr obj)
@@ -241,7 +253,12 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
   36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ThreadPolicy:1.0
   13, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd),  // name = ThreadPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ThreadPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_ThreadPolicy), (char *) &_oc_PortableServer_ThreadPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ThreadPolicy (CORBA::tk_objref,
+                                                            sizeof
+                                                            (_oc_PortableServer_ThreadPolicy), 
+                                                            (char *)
+                                                            &_oc_PortableServer_ThreadPolicy, 0,
+                                                            sizeof (PortableServer::ThreadPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicy = &_tc__tc_PortableServer_ThreadPolicy;
 
 
@@ -254,7 +271,10 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
   10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x5400fdfd),  // name = TRANSIENT
   11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e5400fd),  // name = PERSISTENT
 };
-static CORBA::TypeCode _tc__tc_PortableServer_LifespanPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *) &_oc_PortableServer_LifespanPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_LifespanPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *)
+ &_oc_PortableServer_LifespanPolicyValue, 0, 
+sizeof (PortableServer::LifespanPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicyValue = &_tc__tc_PortableServer_LifespanPolicyValue;
 
 PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (PortableServer::LifespanPolicy_ptr obj)
@@ -327,7 +347,13 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
   38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/LifespanPolicy:1.0
   15, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = LifespanPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_LifespanPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_LifespanPolicy), (char *) &_oc_PortableServer_LifespanPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_LifespanPolicy (CORBA::tk_objref,
+                                                              sizeof
+                                                              (_oc_PortableServer_LifespanPolicy), 
+                                                              (char *)
+                                                              &_oc_PortableServer_LifespanPolicy, 
+                                                              0,
+                                                              sizeof (PortableServer::LifespanPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicy = &_tc__tc_PortableServer_LifespanPolicy;
 
 
@@ -340,7 +366,10 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
   10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x4400fdfd),  // name = UNIQUE_ID
   12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
 };
-static CORBA::TypeCode _tc__tc_PortableServer_IdUniquenessPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_IdUniquenessPolicyValue), (char *) &_oc_PortableServer_IdUniquenessPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_IdUniquenessPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_IdUniquenessPolicyValue), (char *)
+ &_oc_PortableServer_IdUniquenessPolicyValue, 0, sizeof
+ (PortableServer::IdUniquenessPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicyValue = &_tc__tc_PortableServer_IdUniquenessPolicyValue;
 
 PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_duplicate (PortableServer::IdUniquenessPolicy_ptr obj)
@@ -411,7 +440,10 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
   42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/IdUniquenessPolicy:1.0
   19, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = IdUniquenessPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_IdUniquenessPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_IdUniquenessPolicy), (char *) &_oc_PortableServer_IdUniquenessPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_IdUniquenessPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_IdUniquenessPolicy), (char *)
+ &_oc_PortableServer_IdUniquenessPolicy, 0, 
+ sizeof (PortableServer::IdUniquenessPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicy = &_tc__tc_PortableServer_IdUniquenessPolicy;
 
 
@@ -424,7 +456,10 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
   8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400),  // name = USER_ID
   10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x4400fdfd),  // name = SYSTEM_ID
 };
-static CORBA::TypeCode _tc__tc_PortableServer_IdAssignmentPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_IdAssignmentPolicyValue), (char *) &_oc_PortableServer_IdAssignmentPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_IdAssignmentPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_IdAssignmentPolicyValue), (char *)
+ &_oc_PortableServer_IdAssignmentPolicyValue, 0,
+ sizeof (PortableServer::IdAssignmentPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicyValue = &_tc__tc_PortableServer_IdAssignmentPolicyValue;
 
 PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_duplicate (PortableServer::IdAssignmentPolicy_ptr obj)
@@ -495,7 +530,11 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
   42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/IdAssignmentPolicy:1.0
   19, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = IdAssignmentPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_IdAssignmentPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_IdAssignmentPolicy), (char *) &_oc_PortableServer_IdAssignmentPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_IdAssignmentPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_IdAssignmentPolicy), (char *)
+ &_oc_PortableServer_IdAssignmentPolicy, 
+ 0,
+ sizeof (PortableServer::IdAssignmentPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicy = &_tc__tc_PortableServer_IdAssignmentPolicy;
 
 
@@ -508,7 +547,10 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
   20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
   23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e00fd),  // name = NO_IMPLICIT_ACTIVATION
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ImplicitActivationPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue), (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ImplicitActivationPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
+ (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0, 
+ sizeof (PortableServer::ImplicitActivationPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicyValue = &_tc__tc_PortableServer_ImplicitActivationPolicyValue;
 
 PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_duplicate (PortableServer::ImplicitActivationPolicy_ptr obj)
@@ -579,7 +621,10 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
   48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ImplicitActivationPolicy:1.0
   25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd),  // name = ImplicitActivationPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ImplicitActivationPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy), (char *) &_oc_PortableServer_ImplicitActivationPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ImplicitActivationPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy), 
+ (char *)&_oc_PortableServer_ImplicitActivationPolicy, 0, 
+ sizeof (PortableServer::ImplicitActivationPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicy = &_tc__tc_PortableServer_ImplicitActivationPolicy;
 
 
@@ -592,7 +637,10 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
   7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd),  // name = RETAIN
   11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd),  // name = NON_RETAIN
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ServantRetentionPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue), (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ServantRetentionPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue), 
+ (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0, 
+ sizeof (PortableServer::ServantRetentionPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicyValue = &_tc__tc_PortableServer_ServantRetentionPolicyValue;
 
 PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (PortableServer::ServantRetentionPolicy_ptr obj)
@@ -663,7 +711,10 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
   46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ServantRetentionPolicy:1.0
   23, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = ServantRetentionPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ServantRetentionPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantRetentionPolicy), (char *) &_oc_PortableServer_ServantRetentionPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ServantRetentionPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ServantRetentionPolicy), (char *)
+ &_oc_PortableServer_ServantRetentionPolicy, 0, sizeof
+ (PortableServer::ServantRetentionPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicy = &_tc__tc_PortableServer_ServantRetentionPolicy;
 
 
@@ -677,7 +728,10 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
   20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
   20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
 };
-static CORBA::TypeCode _tc__tc_PortableServer_RequestProcessingPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_RequestProcessingPolicyValue), (char *) &_oc_PortableServer_RequestProcessingPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_RequestProcessingPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
+ (char *) &_oc_PortableServer_RequestProcessingPolicyValue, 0, sizeof
+ (PortableServer::RequestProcessingPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicyValue = &_tc__tc_PortableServer_RequestProcessingPolicyValue;
 
 PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_duplicate (PortableServer::RequestProcessingPolicy_ptr obj)
@@ -748,7 +802,10 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
   47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/RequestProcessingPolicy:1.0
   24, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_RequestProcessingPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy), (char *) &_oc_PortableServer_RequestProcessingPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_RequestProcessingPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy), 
+ (char *) &_oc_PortableServer_RequestProcessingPolicy, 0, sizeof
+ (PortableServer::RequestProcessingPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicy = &_tc__tc_PortableServer_RequestProcessingPolicy;
 
 // **************************************************
@@ -767,7 +824,10 @@ static const CORBA::Long _oc_PortableServer_SynchronizationPolicyValue[] =
     10, ACE_NTOHL (0x4e554c4c), ACE_NTOHL (0x5f4c4f43), ACE_NTOHL (0x4b00fdfd),  // name = NULL_LOCK
     12, ACE_NTOHL (0x54485245), ACE_NTOHL (0x41445f4c), ACE_NTOHL (0x4f434b00),  // name = THREAD_LOCK
 };
-static CORBA::TypeCode _tc__tc_PortableServer_SynchronizationPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_SynchronizationPolicyValue), (char *) &_oc_PortableServer_SynchronizationPolicyValue, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_SynchronizationPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_SynchronizationPolicyValue), 
+ (char *) &_oc_PortableServer_SynchronizationPolicyValue, 0, sizeof
+ (PortableServer::SynchronizationPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicyValue = &_tc__tc_PortableServer_SynchronizationPolicyValue;
 
 PortableServer::SynchronizationPolicy_ptr PortableServer::SynchronizationPolicy::_duplicate (PortableServer::SynchronizationPolicy_ptr obj)
@@ -838,7 +898,10 @@ static const CORBA::Long _oc_PortableServer_SynchronizationPolicy[] =
   45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x796e6368), ACE_NTOHL (0x726f6e69), ACE_NTOHL (0x7a617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/SynchronizationPolicy:1.0
   22, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x68726f6e), ACE_NTOHL (0x697a6174), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7900fdfd),  // name = SynchronizationPolicy,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_SynchronizationPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_SynchronizationPolicy), (char *) &_oc_PortableServer_SynchronizationPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_SynchronizationPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_SynchronizationPolicy), (char *)
+ &_oc_PortableServer_SynchronizationPolicy, 0, sizeof
+ (PortableServer::SynchronizationPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicy = &_tc__tc_PortableServer_SynchronizationPolicy;
 
 PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableServer::POAManager_ptr obj)
@@ -965,7 +1028,10 @@ static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
   16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500),  // name = AdapterInactive
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POAManager_AdapterInactive (CORBA::tk_except, sizeof (_oc_PortableServer_POAManager_AdapterInactive), (char *) &_oc_PortableServer_POAManager_AdapterInactive, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POAManager_AdapterInactive
+(CORBA::tk_except, sizeof (_oc_PortableServer_POAManager_AdapterInactive),
+ (char *) &_oc_PortableServer_POAManager_AdapterInactive, 0, sizeof
+ (PortableServer::POAManager::AdapterInactive));
 CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc__tc_PortableServer_POAManager_AdapterInactive;
 
 CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
@@ -984,7 +1050,12 @@ static const CORBA::Long _oc_PortableServer_POAManager[] =
   34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/POAManager:1.0
   11, ACE_NTOHL (0x504f414d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x657200fd),  // name = POAManager,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POAManager (CORBA::tk_objref, sizeof (_oc_PortableServer_POAManager), (char *) &_oc_PortableServer_POAManager, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POAManager (CORBA::tk_objref,
+                                                          sizeof
+                                                          (_oc_PortableServer_POAManager), 
+                                                          (char *)
+                                                          &_oc_PortableServer_POAManager, 0, 
+                                                          sizeof (PortableServer::POAManager));
 CORBA::TypeCode_ptr PortableServer::_tc_POAManager = &_tc__tc_PortableServer_POAManager;
 
 PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicate (PortableServer::AdapterActivator_ptr obj)
@@ -1036,7 +1107,10 @@ static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
   40, ACE_NTOHL (0x49444c3a), 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 (0x312e3000),  // repository ID = IDL:PortableServer/AdapterActivator:1.0
   17, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0xfdfdfd),  // name = AdapterActivator,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_AdapterActivator (CORBA::tk_objref, sizeof (_oc_PortableServer_AdapterActivator), (char *) &_oc_PortableServer_AdapterActivator, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_AdapterActivator
+(CORBA::tk_objref, sizeof (_oc_PortableServer_AdapterActivator), (char *)
+ &_oc_PortableServer_AdapterActivator, 0, sizeof
+ (PortableServer::AdapterActivator));
 CORBA::TypeCode_ptr PortableServer::_tc_AdapterActivator = &_tc__tc_PortableServer_AdapterActivator;
 
 PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (PortableServer::ServantManager_ptr obj)
@@ -1088,7 +1162,13 @@ static const CORBA::Long _oc_PortableServer_ServantManager[] =
   38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ServantManager:1.0
   15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x657200fd),  // name = ServantManager,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ServantManager (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantManager), (char *) &_oc_PortableServer_ServantManager, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ServantManager (CORBA::tk_objref,
+                                                              sizeof
+                                                              (_oc_PortableServer_ServantManager), 
+                                                              (char *)
+                                                              &_oc_PortableServer_ServantManager, 
+                                                              0,
+                                                              sizeof (PortableServer::ServantManager));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantManager = &_tc__tc_PortableServer_ServantManager;
 
 PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicate (PortableServer::ServantActivator_ptr obj)
@@ -1141,7 +1221,10 @@ static const CORBA::Long _oc_PortableServer_ServantActivator[] =
   40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ServantActivator:1.0
   17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0xfdfdfd),  // name = ServantActivator,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ServantActivator (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantActivator), (char *) &_oc_PortableServer_ServantActivator, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ServantActivator
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ServantActivator), (char *)
+ &_oc_PortableServer_ServantActivator, 0, sizeof
+ (PortableServer::ServantActivator));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantActivator = &_tc__tc_PortableServer_ServantActivator;
 
 PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (PortableServer::ServantLocator_ptr obj)
@@ -1194,7 +1277,13 @@ static const CORBA::Long _oc_PortableServer_ServantLocator[] =
   38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744c6f), ACE_NTOHL (0x6361746f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ServantLocator:1.0
   15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744c), ACE_NTOHL (0x6f636174), ACE_NTOHL (0x6f7200fd),  // name = ServantLocator,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_ServantLocator (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantLocator), (char *) &_oc_PortableServer_ServantLocator, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_ServantLocator (CORBA::tk_objref,
+                                                              sizeof
+                                                              (_oc_PortableServer_ServantLocator), 
+                                                              (char *)
+                                                              &_oc_PortableServer_ServantLocator,
+                                                              0,
+                                                              sizeof (PortableServer::ServantLocator)); 
 CORBA::TypeCode_ptr PortableServer::_tc_ServantLocator = &_tc__tc_PortableServer_ServantLocator;
 
 PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr obj)
@@ -1320,7 +1409,10 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
   48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79457869), ACE_NTOHL (0x7374733a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/POA/AdapterAlreadyExists:1.0
   21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0xfdfdfd),  // name = AdapterAlreadyExists
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterAlreadyExists (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists), (char *) &_oc_PortableServer_POA_AdapterAlreadyExists, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterAlreadyExists
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists), 
+ (char *) &_oc_PortableServer_POA_AdapterAlreadyExists, 0, sizeof
+ (PortableServer::POA::AdapterAlreadyExists));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc__tc_PortableServer_POA_AdapterAlreadyExists;
 
 // default constructor
@@ -1413,7 +1505,10 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterInactive[] =
   43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x61637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA/AdapterInactive:1.0
   16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500),  // name = AdapterInactive
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterInactive (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterInactive), (char *) &_oc_PortableServer_POA_AdapterInactive, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterInactive
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterInactive), (char *)
+ &_oc_PortableServer_POA_AdapterInactive, 0, sizeof
+ (PortableServer::POA::AdapterInactive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterInactive = &_tc__tc_PortableServer_POA_AdapterInactive;
 
 // default constructor
@@ -1507,7 +1602,10 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
   19, ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465724e), ACE_NTOHL (0x6f6e4578), ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e7400fd),  // name = AdapterNonExistent
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterNonExistent (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterNonExistent), (char *) &_oc_PortableServer_POA_AdapterNonExistent, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterNonExistent
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterNonExistent), (char *)
+ &_oc_PortableServer_POA_AdapterNonExistent, 0, sizeof
+ (PortableServer::POA::AdapterNonExistent));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = &_tc__tc_PortableServer_POA_AdapterNonExistent;
 
 // default constructor
@@ -1612,7 +1710,10 @@ static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
   6, ACE_NTOHL (0x696e6465), ACE_NTOHL (0x7800fdfd),  // name = index
   CORBA::tk_ushort,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_InvalidPolicy (CORBA::tk_except, sizeof (_oc_PortableServer_POA_InvalidPolicy), (char *) &_oc_PortableServer_POA_InvalidPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_InvalidPolicy
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_InvalidPolicy), (char *)
+ &_oc_PortableServer_POA_InvalidPolicy, 0, sizeof
+ (PortableServer::POA::InvalidPolicy));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = &_tc__tc_PortableServer_POA_InvalidPolicy;
 
 // default constructor
@@ -1706,7 +1807,12 @@ static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
   10, ACE_NTOHL (0x4e6f5365), ACE_NTOHL (0x7276616e), ACE_NTOHL (0x7400fdfd),  // name = NoServant
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_NoServant (CORBA::tk_except, sizeof (_oc_PortableServer_POA_NoServant), (char *) &_oc_PortableServer_POA_NoServant, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_NoServant (CORBA::tk_except,
+                                                             sizeof
+                                                             (_oc_PortableServer_POA_NoServant), 
+                                                             (char *)
+                                                             &_oc_PortableServer_POA_NoServant, 0,
+                                                             sizeof (PortableServer::POA::NoServant));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant = &_tc__tc_PortableServer_POA_NoServant;
 
 // default constructor
@@ -1800,7 +1906,10 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
   20, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x6374416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ObjectAlreadyActive (CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectAlreadyActive), (char *) &_oc_PortableServer_POA_ObjectAlreadyActive, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_ObjectAlreadyActive
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectAlreadyActive), 
+ (char *) &_oc_PortableServer_POA_ObjectAlreadyActive, 0, sizeof
+ (PortableServer::POA::ObjectAlreadyActive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc__tc_PortableServer_POA_ObjectAlreadyActive;
 
 // default constructor
@@ -1894,7 +2003,10 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
   16, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x69766500),  // name = ObjectNotActive
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ObjectNotActive (CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectNotActive), (char *) &_oc_PortableServer_POA_ObjectNotActive, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_ObjectNotActive
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectNotActive), (char *)
+ &_oc_PortableServer_POA_ObjectNotActive, 0, sizeof
+ (PortableServer::POA::ObjectNotActive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = &_tc__tc_PortableServer_POA_ObjectNotActive;
 
 // default constructor
@@ -1988,7 +2100,10 @@ static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
   21, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794163), ACE_NTOHL (0x74697665), ACE_NTOHL (0xfdfdfd),  // name = ServantAlreadyActive
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ServantAlreadyActive (CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantAlreadyActive), (char *) &_oc_PortableServer_POA_ServantAlreadyActive, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_ServantAlreadyActive
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantAlreadyActive), 
+ (char *) &_oc_PortableServer_POA_ServantAlreadyActive, 0, sizeof
+ (PortableServer::POA::ServantAlreadyActive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc__tc_PortableServer_POA_ServantAlreadyActive;
 
 // default constructor
@@ -2082,7 +2197,10 @@ static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
   17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697665), ACE_NTOHL (0xfdfdfd),  // name = ServantNotActive
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ServantNotActive (CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantNotActive), (char *) &_oc_PortableServer_POA_ServantNotActive, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_ServantNotActive
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantNotActive), (char *)
+ &_oc_PortableServer_POA_ServantNotActive, 0, sizeof
+ (PortableServer::POA::ServantNotActive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = &_tc__tc_PortableServer_POA_ServantNotActive;
 
 // default constructor
@@ -2176,7 +2294,10 @@ static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
   13, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67416461), ACE_NTOHL (0x70746572), ACE_NTOHL (0xfdfdfd),  // name = WrongAdapter
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongAdapter (CORBA::tk_except, sizeof (_oc_PortableServer_POA_WrongAdapter), (char *) &_oc_PortableServer_POA_WrongAdapter, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongAdapter
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_WrongAdapter), (char *)
+ &_oc_PortableServer_POA_WrongAdapter, 0, sizeof
+ (PortableServer::POA::WrongAdapter));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = &_tc__tc_PortableServer_POA_WrongAdapter;
 
 // default constructor
@@ -2270,7 +2391,10 @@ static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
   12, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = WrongPolicy
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongPolicy (CORBA::tk_except, sizeof (_oc_PortableServer_POA_WrongPolicy), (char *) &_oc_PortableServer_POA_WrongPolicy, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongPolicy
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_WrongPolicy), (char *)
+ &_oc_PortableServer_POA_WrongPolicy, 0, sizeof
+ (PortableServer::POA::WrongPolicy));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc__tc_PortableServer_POA_WrongPolicy;
 
 CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
@@ -2289,7 +2413,13 @@ static const CORBA::Long _oc_PortableServer_POA[] =
   27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f413a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA:1.0
   4, ACE_NTOHL (0x504f4100),  // name = POA,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_POA (CORBA::tk_objref, sizeof (_oc_PortableServer_POA), (char *) &_oc_PortableServer_POA, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_POA (CORBA::tk_objref, sizeof
+                                                   (_oc_PortableServer_POA),
+                                                   (char *)
+                                                   &_oc_PortableServer_POA,
+                                                   0,
+                                                   sizeof
+                                                   (PortableServer::POA));
 CORBA::TypeCode_ptr PortableServer::_tc_POA = &_tc__tc_PortableServer_POA;
 
 PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer::Current_ptr obj)
@@ -2415,7 +2545,10 @@ static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
   10, ACE_NTOHL (0x4e6f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x7400fdfd),  // name = NoContext
   0, // member count
 };
-static CORBA::TypeCode _tc__tc_PortableServer_Current_NoContext (CORBA::tk_except, sizeof (_oc_PortableServer_Current_NoContext), (char *) &_oc_PortableServer_Current_NoContext, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_Current_NoContext
+(CORBA::tk_except, sizeof (_oc_PortableServer_Current_NoContext), (char *)
+ &_oc_PortableServer_Current_NoContext, 0, sizeof
+ (PortableServer::Current::NoContext));
 CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc__tc_PortableServer_Current_NoContext;
 
 PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &env)
@@ -2461,7 +2594,10 @@ static const CORBA::Long _oc_PortableServer_Current[] =
   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e743a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/Current:1.0
   8, ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400),  // name = Current,
 };
-static CORBA::TypeCode _tc__tc_PortableServer_Current (CORBA::tk_objref, sizeof (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current, 0);
+static CORBA::TypeCode _tc__tc_PortableServer_Current (CORBA::tk_objref, sizeof
+                                                       (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current, 
+                                                       0,
+                                                       sizeof (PortableServer::Current));
 CORBA::TypeCode_ptr PortableServer::_tc_Current = &_tc__tc_PortableServer_Current;
 
 char *
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 6112d2a1c8f..789fe6df9d9 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -92,6 +92,63 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind)
     private_state_ (new TC_Private_State (kind)),
     non_aligned_buffer_ (0)
 {
+  // all these are simple typecodes and the comparison is based solely on
+  this->private_state_->tc_size_known_ = 1;
+  switch (this->kind_)
+    {
+    case CORBA::tk_null:
+    case CORBA::tk_void:
+      this->private_state_->tc_size_ = 0;
+      break;
+    case CORBA::tk_short:
+      this->private_state_->tc_size_ = sizeof (CORBA::Short);
+      break;
+    case CORBA::tk_ushort:
+      this->private_state_->tc_size_ = sizeof (CORBA::UShort);
+      break;
+    case CORBA::tk_long:
+      this->private_state_->tc_size_ = sizeof (CORBA::Long);
+      break;
+    case CORBA::tk_ulong:
+      this->private_state_->tc_size_ = sizeof (CORBA::ULong);
+      break;
+    case CORBA::tk_float:
+      this->private_state_->tc_size_ = sizeof (CORBA::Float);
+      break;
+    case CORBA::tk_double:
+      this->private_state_->tc_size_ = sizeof (CORBA::Double);
+      break;
+    case CORBA::tk_longlong:
+      this->private_state_->tc_size_ = sizeof (CORBA::LongLong);
+      break;
+    case CORBA::tk_ulonglong:
+      this->private_state_->tc_size_ = sizeof (CORBA::ULongLong);
+      break;
+    case CORBA::tk_longdouble:
+      this->private_state_->tc_size_ = sizeof (CORBA::LongDouble);
+      break;
+    case CORBA::tk_boolean:
+      this->private_state_->tc_size_ = sizeof (CORBA::Boolean);
+      break;
+    case CORBA::tk_octet:
+      this->private_state_->tc_size_ = sizeof (CORBA::Octet);
+      break;
+    case CORBA::tk_char:
+      this->private_state_->tc_size_ = sizeof (CORBA::Char);
+      break;
+    case CORBA::tk_wchar:
+      this->private_state_->tc_size_ = sizeof (CORBA::WChar);
+      break;
+    case CORBA::tk_TypeCode:
+      this->private_state_->tc_size_ = sizeof (CORBA::TypeCode);
+      break;
+    case CORBA::tk_Principal:
+      this->private_state_->tc_size_ = sizeof (CORBA::Principal);
+      break;
+    case CORBA::tk_any:
+      this->private_state_->tc_size_ = sizeof (CORBA::Any);
+      break;
+    }
 }
 
 // Constructor for all other typecodes, including constants with
@@ -101,6 +158,7 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
                                 size_t length,
                                 const char *buffer,
                                 CORBA::Boolean orb_owns_tc,
+                                CORBA::ULong size,
                                 CORBA::TypeCode_ptr parent)
   //  : length_ (length - 4),
   : length_ (length),
@@ -159,6 +217,8 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
 
       (void) ACE_OS::memcpy (start, buffer, this->length_);
       this->buffer_ = start;
+      this->private_state_->tc_size_known_ = 1;
+      this->private_state_->tc_size_ = size;
     }
   else
     {
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 903a26779b9..222d513f393 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -152,6 +152,7 @@ public:
                   size_t length,
                   const char *buffer,
                   CORBA::Boolean orb_owns_tc,
+                  CORBA::ULong size,
                   CORBA::TypeCode_ptr parent = 0);
   // This constructor is used both for typecode constants and for
   // heap-allocated TypeCodes.  The two are distinguished by the
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 379dcfa8fe1..5e233eb78e5 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -135,7 +135,8 @@ TAO_TypeCodes::init (void)
   CORBA::_tc_string = new CORBA::TypeCode (CORBA::tk_string,
                                            sizeof _oc_string,
                                            (char*)&_oc_string,
-                                           1);
+                                           1,
+                                           sizeof (CORBA::String_var));
 
   static const CORBA::Long _oc_wstring [] =
   {
@@ -146,7 +147,8 @@ TAO_TypeCodes::init (void)
   CORBA::_tc_wstring = new CORBA::TypeCode (CORBA::tk_wstring,
                                             sizeof _oc_wstring,
                                             (char *) &_oc_wstring,
-                                            1);
+                                            1,
+                                            sizeof (CORBA::WString));
 
   //
   // Various things that can be passed as "general" parameters:
@@ -182,7 +184,8 @@ TAO_TypeCodes::init (void)
   CORBA::_tc_Object = new CORBA::TypeCode (CORBA::tk_objref,
                                            sizeof oc_objref,
                                            (char *) &oc_objref,
-                                           1);
+                                           1,
+                                           sizeof (CORBA::Object));
 
   // Static initialization of the two user-defined exceptions that
   // are part of the ORB.
@@ -207,7 +210,8 @@ TAO_TypeCodes::init (void)
   CORBA::TypeCode::_tc_Bounds = new CORBA::TypeCode (CORBA::tk_except,
                                                      sizeof tc_buf_Bounds,
                                                      tc_buf_Bounds,
-                                                     1);
+                                                     1,
+                                                     sizeof (CORBA::TypeCode::Bounds));
 
   static char tc_buf_BadKind [] =
   {
@@ -229,7 +233,8 @@ TAO_TypeCodes::init (void)
   CORBA::TypeCode::_tc_BadKind = new CORBA::TypeCode (CORBA::tk_except,
                                                       sizeof tc_buf_BadKind,
                                                       tc_buf_BadKind,
-                                                      1);
+                                                      1,
+                                                      sizeof (CORBA::TypeCode::BadKind));
 
   static const CORBA::Long _oc_CORBA_Identifier[] =
   {
@@ -243,7 +248,8 @@ TAO_TypeCodes::init (void)
   CORBA::_tc_Identifier = new CORBA::TypeCode (CORBA::tk_alias,
                                                sizeof (_oc_CORBA_Identifier),
                                                (char *) &_oc_CORBA_Identifier,
-                                               1);
+                                               1,
+                                               sizeof (CORBA::Identifier));
 
   static const CORBA::Long _oc_CORBA_RepositoryId[] =
   {
@@ -258,7 +264,8 @@ TAO_TypeCodes::init (void)
                                                  (_oc_CORBA_RepositoryId),
                                                  (char *)
                                                  &_oc_CORBA_RepositoryId,
-                                                 1);
+                                                 1,
+                                                 sizeof (CORBA::RepositoryId));
 
 
   static const CORBA::Long _oc_CORBA_PolicyType[] =
@@ -272,7 +279,8 @@ TAO_TypeCodes::init (void)
                                                (_oc_CORBA_PolicyType),
                                                (char *)
                                                &_oc_CORBA_PolicyType,
-                                               1);
+                                               1,
+                                               sizeof (CORBA::PolicyType));
 
   static const CORBA::Long _oc_CORBA_Policy[] =
   {
@@ -283,7 +291,8 @@ TAO_TypeCodes::init (void)
   CORBA::_tc_Policy = new CORBA::TypeCode (CORBA::tk_objref,
                                            sizeof (_oc_CORBA_Policy),
                                            (char *) &_oc_CORBA_Policy,
-                                           1);
+                                           1,
+                                           sizeof (CORBA::Policy));
 
  static const CORBA::Long _oc_CORBA_PolicyList[] =
  {
@@ -303,7 +312,8 @@ TAO_TypeCodes::init (void)
  CORBA::_tc_PolicyList = new CORBA::TypeCode (CORBA::tk_alias,
                                               sizeof (_oc_CORBA_PolicyList),
                                               (char *) &_oc_CORBA_PolicyList,
-                                              1);
+                                              1,
+                                              sizeof (CORBA::PolicyList));
 
  static const CORBA::Long _oc_CORBA_Current[] =
  {
@@ -314,7 +324,8 @@ TAO_TypeCodes::init (void)
  CORBA::_tc_Current = new CORBA::TypeCode (CORBA::tk_objref,
                                            sizeof (_oc_CORBA_Current),
                                            (char *) &_oc_CORBA_Current,
-                                           1);
+                                           1,
+                                           sizeof (CORBA::Current));
 
  // The following are internal to the TAO ORB
 
@@ -340,7 +351,8 @@ TAO_TypeCodes::init (void)
   TC_opaque = new CORBA::TypeCode (CORBA::tk_sequence,
                                    sizeof _oc_opaque,
                                    (char *) &_oc_opaque,
-                                   1);
+                                   1,
+                                   sizeof (TAO_opaque));
 
   // Octet codes for the parameters of the ServiceContextList TypeCode
   // ...  this is a CDR encapsulation holding two parameters (like all
@@ -405,7 +417,9 @@ TAO_TypeCodes::init (void)
   TC_ServiceContextList = new CORBA::TypeCode (CORBA::tk_sequence,
                                                sizeof _oc_svc_ctx_list,
                                                (char *) &_oc_svc_ctx_list,
-                                               1);
+                                               1,
+                                               sizeof (TAO_GIOP_ServiceContextList));
+
   static const CORBA::ULong oc_completion_status [] =
   {
     TAO_ENCAP_BYTE_ORDER, // byte order flag, tricky
@@ -420,7 +434,8 @@ TAO_TypeCodes::init (void)
     new CORBA::TypeCode (CORBA::tk_enum,
                          sizeof oc_completion_status,
                          (char *) &oc_completion_status,
-                         1);
+                         1,
+                         sizeof (CompletionStatus));
 }
 
 // destroy all the typecodes owned by the ORB
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index cb26bec2a1c..d0ca25aa876 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -326,7 +326,8 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                         *tcp = new CORBA::TypeCode (ACE_static_cast(CORBA::TCKind, kind),
                                                     8,
                                                     ACE_reinterpret_cast(char*,_oc_bounded_string),
-                                                    0, 0);
+                                                    0, sizeof
+                                                    (CORBA::String_var), 0);
 #elif 0
                         // This one fails because we are passing the
                         // parent but the buffer (_oc_bounded_string) is
@@ -339,7 +340,8 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                         _oc_bounded_string [1] = (CORBA::Long) bound;
                         *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
                                                     bound, (char *) &_oc_bounded_string,
-                                                    0, parent);
+                                                    0, sizeof
+                                                    (CORBA::String_var), parent);
 #else
                         // This depends on the fact that <stream> is
                         // actually pointing to the parent CDR stream,
@@ -347,7 +349,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                         *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
                                                     8,
                                                     stream->rd_ptr () - 8,
-                                                    0, parent);
+                                                    0, 0, parent);
 #endif
                       }
                   }
@@ -423,6 +425,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                                                 indir_len,
                                                 indir_stream.rd_ptr(),
                                                 0,
+                                                0,
                                                 parent);
                   }
               }
@@ -454,6 +457,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                                             len,
                                             stream->rd_ptr (),
                                             0,
+                                            0,
                                             parent);
                 // skip length number of bytes in the stream, else we may
                 // leave the stream in an undefined state