ChangeLogTag:Wed Dec 24 14:15:24 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

6 files changed, 1318 insertions, 511 deletions

diff --git a/TAO/tao/IOP_Codec.pidl b/TAO/tao/IOP_Codec.pidl
index 228536631e4..f42144a9bcc 100644
--- a/TAO/tao/IOP_Codec.pidl
+++ b/TAO/tao/IOP_Codec.pidl
@@ -18,12 +18,12 @@
  *        -Wb,post_include="ace/post.h"
  *        IOP_Codec.pidl
  *
- * and then:
+ * and then apply the patches in  diffs/IOP_Codec.diff. 
  *
- * cp orig/IOP_CodecC.{h,i,cpp} .
- * patch < diffs/IOP_Codec.diff
- *
- * The code left in IOP_CodecC.{h,i,cpp} is ready for use.
+ * The code left in IOP_CodecC.{h,i,cpp} and IOP_CodecA.{h,cpp} is
+ * ready for use. If you are hand applying the patch be careful. Leave
+ * the typecodes for the user exceptions in the *C.h file so that they
+ * can be used by _type () call that is generated. 
  *
  */
 
diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp
index aa7a3982d8c..71cc586d475 100644
--- a/TAO/tao/IOP_CodecA.cpp
+++ b/TAO/tao/IOP_CodecA.cpp
@@ -32,6 +32,345 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x632f496e),
+  ACE_NTOHL (0x76616c69),
+  ACE_NTOHL (0x64547970),
+  ACE_NTOHL (0x65466f72),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
+    23,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696454),
+  ACE_NTOHL (0x79706546),
+  ACE_NTOHL (0x6f72456e),
+  ACE_NTOHL (0x636f6469),
+  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
+    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
+    0,
+    sizeof (IOP::Codec::InvalidTypeForEncoding)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
+  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x632f466f),
+  ACE_NTOHL (0x726d6174),
+  ACE_NTOHL (0x4d69736d),
+  ACE_NTOHL (0x61746368),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
+    15,
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61744d69),
+  ACE_NTOHL (0x736d6174),
+  ACE_NTOHL (0x63680000),  // name = FormatMismatch
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_FormatMismatch),
+    (char *) &_oc_IOP_Codec_FormatMismatch,
+    0,
+    sizeof (IOP::Codec::FormatMismatch)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
+  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x632f5479),
+  ACE_NTOHL (0x70654d69),
+  ACE_NTOHL (0x736d6174),
+  ACE_NTOHL (0x63683a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
+    13,
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x4d69736d),
+  ACE_NTOHL (0x61746368),
+  ACE_NTOHL (0x0),  // name = TypeMismatch
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_TypeMismatch),
+    (char *) &_oc_IOP_Codec_TypeMismatch,
+    0,
+    sizeof (IOP::Codec::TypeMismatch)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
+  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_Codec[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x633a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
+    6,
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63000000),  // name = Codec
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_Codec),
+    (char *) &_oc_IOP_Codec,
+    0,
+    sizeof (IOP::Codec)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Codec =
+    &_tc_TAO_tc_IOP_Codec;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_EncodingFormat[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61743a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+    15,
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61740000),  // name = EncodingFormat
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_EncodingFormat),
+    (char *) &_oc_IOP_EncodingFormat,
+    0,
+    sizeof (IOP::EncodingFormat)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_EncodingFormat =
+    &_tc_TAO_tc_IOP_EncodingFormat;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_Encoding[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
+    9,
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x0),  // name = Encoding
+  3, // member count
+    7,
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x61740000),  // name = format
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x456e636f),
+    ACE_NTOHL (0x64696e67),
+    ACE_NTOHL (0x466f726d),
+    ACE_NTOHL (0x61743a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+        15,
+    ACE_NTOHL (0x456e636f),
+    ACE_NTOHL (0x64696e67),
+    ACE_NTOHL (0x466f726d),
+    ACE_NTOHL (0x61740000),  // name = EncodingFormat
+        CORBA::tk_short,
+
+
+  14,
+  ACE_NTOHL (0x6d616a6f),
+  ACE_NTOHL (0x725f7665),
+  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6e000000),  // name = major_version
+    CORBA::tk_octet,
+
+  14,
+  ACE_NTOHL (0x6d696e6f),
+  ACE_NTOHL (0x725f7665),
+  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6e000000),  // name = minor_version
+    CORBA::tk_octet,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_Encoding),
+    (char *) &_oc_IOP_Encoding,
+    0,
+    sizeof (IOP::Encoding)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Encoding =
+    &_tc_TAO_tc_IOP_Encoding;
+}
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63466163),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f556e6b),
+  ACE_NTOHL (0x6e6f776e),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
+    16,
+  ACE_NTOHL (0x556e6b6e),
+  ACE_NTOHL (0x6f776e45),
+  ACE_NTOHL (0x6e636f64),
+  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
+    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
+    0,
+    sizeof (IOP::CodecFactory::UnknownEncoding)
+  );
+
+::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
+  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_IOP_CodecFactory[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63466163),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
+    13,
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63466163),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x0),  // name = CodecFactory
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_CodecFactory),
+    (char *) &_oc_IOP_CodecFactory,
+    0,
+    sizeof (IOP::CodecFactory)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_CodecFactory =
+    &_tc_TAO_tc_IOP_CodecFactory;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -100,7 +439,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -172,7 +511,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -244,7 +583,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -316,7 +655,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -443,7 +782,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -591,5 +930,4 @@ CORBA::Boolean operator>>= (
         IOP::CodecFactory \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOP_CodecA.h b/TAO/tao/IOP_CodecA.h
index 9d27ae4ceed..ad7f3506cb2 100644
--- a/TAO/tao/IOP_CodecA.h
+++ b/TAO/tao/IOP_CodecA.h
@@ -33,6 +33,18 @@
 
 #include /**/ "ace/pre.h"
 
+// ==== Handcrafted
+namespace IOP
+{
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/any_op_ch.cpp:52
 
@@ -90,4 +102,3 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFacto
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index b6639a63342..619ba1bdd1b 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -90,12 +90,12 @@ TAO::Objref_Traits<IOP::Codec>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*IOP__TAO_Codec_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
@@ -192,47 +192,6 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x632f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64547970), 
-  ACE_NTOHL (0x65466f72), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
-    23,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696454), 
-  ACE_NTOHL (0x79706546), 
-  ACE_NTOHL (0x6f72456e), 
-  ACE_NTOHL (0x636f6469), 
-  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
-    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
-    0,
-    sizeof (IOP::Codec::InvalidTypeForEncoding)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
-  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
-
-// TAO_IDL - Generated from 
 // be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::FormatMismatch::FormatMismatch (void)
@@ -329,43 +288,6 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x632f466f), 
-  ACE_NTOHL (0x726d6174), 
-  ACE_NTOHL (0x4d69736d), 
-  ACE_NTOHL (0x61746368), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
-    15,
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61744d69), 
-  ACE_NTOHL (0x736d6174), 
-  ACE_NTOHL (0x63680000),  // name = FormatMismatch
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_FormatMismatch),
-    (char *) &_oc_IOP_Codec_FormatMismatch,
-    0,
-    sizeof (IOP::Codec::FormatMismatch)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
-  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
-
-// TAO_IDL - Generated from 
 // be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::TypeMismatch::TypeMismatch (void)
@@ -461,49 +383,13 @@ CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
   return ::IOP::Codec::_tc_TypeMismatch;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x632f5479), 
-  ACE_NTOHL (0x70654d69), 
-  ACE_NTOHL (0x736d6174), 
-  ACE_NTOHL (0x63683a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
-    13,
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x4d69736d), 
-  ACE_NTOHL (0x61746368), 
-  ACE_NTOHL (0x0),  // name = TypeMismatch
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_TypeMismatch),
-    (char *) &_oc_IOP_Codec_TypeMismatch,
-    0,
-    sizeof (IOP::Codec::TypeMismatch)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
-  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
-
 IOP::Codec::Codec (void)
 {}
 
 IOP::Codec::~Codec (void)
 {}
 
-void 
+void
 IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
 {
   Codec *_tao_tmp_pointer =
@@ -521,10 +407,10 @@ IOP::Codec::_narrow (
     {
       return Codec::_nil ();
     }
-  
+
   Codec_ptr proxy =
     dynamic_cast<Codec_ptr> (_tao_objref);
-  
+
   return Codec::_duplicate (proxy);
 }
 
@@ -538,10 +424,10 @@ IOP::Codec::_unchecked_narrow (
     {
       return Codec::_nil ();
     }
-  
+
   Codec_ptr proxy =
     dynamic_cast<Codec_ptr> (_tao_objref);
-  
+
   return Codec::_duplicate (proxy);
 }
 
@@ -552,7 +438,7 @@ IOP::Codec::_duplicate (Codec_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -597,155 +483,9 @@ IOP::Codec::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x633a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
-    6,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63000000),  // name = Codec
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_Codec),
-    (char *) &_oc_IOP_Codec,
-    0,
-    sizeof (IOP::Codec)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Codec =
-    &_tc_TAO_tc_IOP_Codec;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_EncodingFormat[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-    15,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61740000),  // name = EncodingFormat
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_EncodingFormat),
-    (char *) &_oc_IOP_EncodingFormat,
-    0,
-    sizeof (IOP::EncodingFormat)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_EncodingFormat =
-    &_tc_TAO_tc_IOP_EncodingFormat;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Encoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
-    9,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x0),  // name = Encoding
-  3, // member count
-    7,
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x61740000),  // name = format
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61743a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-        15,
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61740000),  // name = EncodingFormat
-        CORBA::tk_short,
-
-
-  14,
-  ACE_NTOHL (0x6d616a6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e000000),  // name = major_version
-    CORBA::tk_octet,
-
-  14,
-  ACE_NTOHL (0x6d696e6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e000000),  // name = minor_version
-    CORBA::tk_octet,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_Encoding),
-    (char *) &_oc_IOP_Encoding,
-    0,
-    sizeof (IOP::Encoding)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Encoding =
-    &_tc_TAO_tc_IOP_Encoding;
-}
-
-// TAO_IDL - Generated from 
 // be/be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IOP::Encoding::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -796,12 +536,12 @@ TAO::Objref_Traits<IOP::CodecFactory>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*IOP__TAO_CodecFactory_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
@@ -897,44 +637,6 @@ CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
   return ::IOP::CodecFactory::_tc_UnknownEncoding;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f556e6b), 
-  ACE_NTOHL (0x6e6f776e), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
-    16,
-  ACE_NTOHL (0x556e6b6e), 
-  ACE_NTOHL (0x6f776e45), 
-  ACE_NTOHL (0x6e636f64), 
-  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
-    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
-    0,
-    sizeof (IOP::CodecFactory::UnknownEncoding)
-  );
-
-::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
-  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
 
 IOP::CodecFactory::CodecFactory (void)
 {}
@@ -942,7 +644,7 @@ IOP::CodecFactory::CodecFactory (void)
 IOP::CodecFactory::~CodecFactory (void)
 {}
 
-void 
+void
 IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   CodecFactory *_tao_tmp_pointer =
@@ -960,10 +662,10 @@ IOP::CodecFactory::_narrow (
     {
       return CodecFactory::_nil ();
     }
-  
+
   CodecFactory_ptr proxy =
     dynamic_cast<CodecFactory_ptr> (_tao_objref);
-  
+
   return CodecFactory::_duplicate (proxy);
 }
 
@@ -977,10 +679,10 @@ IOP::CodecFactory::_unchecked_narrow (
     {
       return CodecFactory::_nil ();
     }
-  
+
   CodecFactory_ptr proxy =
     dynamic_cast<CodecFactory_ptr> (_tao_objref);
-  
+
   return CodecFactory::_duplicate (proxy);
 }
 
@@ -991,7 +693,7 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1036,43 +738,6 @@ IOP::CodecFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_CodecFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
-    13,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x0),  // name = CodecFactory
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_CodecFactory),
-    (char *) &_oc_IOP_CodecFactory,
-    0,
-    sizeof (IOP::CodecFactory)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_CodecFactory =
-    &_tc_TAO_tc_IOP_CodecFactory;
-}
-
-// TAO_IDL - Generated from
 // be/be_visitor_root/root.cpp:1725
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -1086,7 +751,7 @@ namespace IOP
     TAO_Objref_Var_T<
         IOP::Codec
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         IOP::Codec
@@ -1111,7 +776,7 @@ namespace IOP
     TAO_Objref_Var_T<
         IOP::CodecFactory
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         IOP::CodecFactory
@@ -1128,7 +793,7 @@ namespace IOP
     TAO_Objref_Var_T< \
         IOP::Codec
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         IOP::Codec
@@ -1153,11 +818,10 @@ namespace IOP
     TAO_Objref_Var_T< \
         IOP::CodecFactory
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         IOP::CodecFactory
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index 2de9008c69d..a65cbb3a8be 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -71,13 +71,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-  
+
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,22 +87,22 @@ namespace TAO
 
 namespace IOP
 {
-  
+
   // TAO_IDL - Generated from
   // be/be_interface.cpp:611
 
 #if !defined (_IOP_CODEC__VAR_OUT_CH_)
 #define _IOP_CODEC__VAR_OUT_CH_
-  
+
   class Codec;
   typedef Codec *Codec_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Codec
       >
     Codec_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Codec
@@ -110,58 +110,58 @@ namespace IOP
     Codec_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODEC_CH_)
 #define _IOP_CODEC_CH_
-  
+
   class TAO_Export Codec
     : public virtual CORBA::Object
   {
   public:
     typedef Codec_ptr _ptr_type;
     typedef Codec_var _var_type;
-    
+
     // The static operations.
     static Codec_ptr _duplicate (Codec_ptr obj);
-    
+
     static Codec_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Codec_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Codec_ptr _nil (void)
     {
       return (Codec_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-    
+
     class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
     {
     public:
-      
+
       InvalidTypeForEncoding (void);
       InvalidTypeForEncoding (const InvalidTypeForEncoding &);
       ~InvalidTypeForEncoding (void);
 
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -173,43 +173,43 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be/be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
 #define _IOP_CODEC_FORMATMISMATCH_CH_
-    
+
     class TAO_Export FormatMismatch : public CORBA::UserException
     {
     public:
-      
+
       FormatMismatch (void);
       FormatMismatch (const FormatMismatch &);
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static FormatMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -221,43 +221,43 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be/be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-    
+
     class TAO_Export TypeMismatch : public CORBA::UserException
     {
     public:
-      
+
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -269,28 +269,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be/be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -299,10 +299,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode (
         const CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -311,10 +311,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::FormatMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode_value (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -323,10 +323,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
         CORBA::TypeCode_ptr tc
@@ -337,102 +337,90 @@ namespace IOP
         , IOP::Codec::FormatMismatch
         , IOP::Codec::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_interface/interface_ch.cpp:196
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Codec (void);
-    
+
     virtual ~Codec (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Codec (const Codec &);
-    
+
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
-  
+
+
   // TAO_IDL - Generated from
   // be/be_visitor_typedef/typedef_ch.cpp:342
-  
+
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
-  
+
+
   // TAO_IDL - Generated from
   // be/be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-  
+
   // TAO_IDL - Generated from
   // be/be_type.cpp:258
-  
+
   struct Encoding;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-  
+
   typedef
     Encoding &
     Encoding_out;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export Encoding
   {
     typedef Encoding_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::EncodingFormat format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
   };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
-  
+
+
   // TAO_IDL - Generated from
   // be/be_interface.cpp:611
 
 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
 #define _IOP_CODECFACTORY__VAR_OUT_CH_
-  
+
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         CodecFactory
       >
     CodecFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         CodecFactory
@@ -440,58 +428,58 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-  
+
   class TAO_Export CodecFactory
     : public virtual CORBA::Object
   {
   public:
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-    
+
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-    
+
     static CodecFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static CodecFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static CodecFactory_ptr _nil (void)
     {
       return (CodecFactory_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-    
+
     class TAO_Export UnknownEncoding : public CORBA::UserException
     {
     public:
-      
+
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static UnknownEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -503,28 +491,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be/be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::Codec_ptr create_codec (
         const IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -533,37 +521,32 @@ namespace IOP
         CORBA::SystemException
         , IOP::CodecFactory::UnknownEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_interface/interface_ch.cpp:196
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     CodecFactory (void);
-    
+
     virtual ~CodecFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     CodecFactory (const CodecFactory &);
-    
+
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
 
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:66
@@ -579,7 +562,7 @@ namespace TAO
 
 #if !defined (_IOP_CODEC__TRAITS_CH_)
 #define _IOP_CODEC__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<IOP::Codec>
   {
@@ -600,7 +583,7 @@ namespace TAO
 
 #if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
 #define _IOP_CODECFACTORY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<IOP::CodecFactory>
   {
@@ -654,4 +637,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
diff --git a/TAO/tao/diffs/IOP_Codec.diff b/TAO/tao/diffs/IOP_Codec.diff
index d8a9393d069..4bf79b5dcf1 100644
--- a/TAO/tao/diffs/IOP_Codec.diff
+++ b/TAO/tao/diffs/IOP_Codec.diff
@@ -1,25 +1,837 @@
---- orig/IOP_CodecC.h	2003-04-27 09:41:09.000000000 -0500
-+++ ./IOP_CodecC.h	2003-04-27 10:09:46.000000000 -0500
-@@ -30,17 +30,16 @@
+--- orig/IOP_CodecC.h	2003-12-24 14:12:42.000000000 -0600
++++ IOP_CodecC.h	2003-12-24 13:58:15.000000000 -0600
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
  
- #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
- #define _TAO_IDL_ORIG_IOP_CODECC_H_
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -364,10 +364,6 @@
+ 
+ #endif /* end #if !defined */
+   
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_typecode/typecode_decl.cpp:44
+-  
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
+   
+   // TAO_IDL - Generated from
+   // be/be_visitor_typedef/typedef_ch.cpp:342
+@@ -375,10 +371,6 @@
+   typedef CORBA::Short EncodingFormat;
+   typedef CORBA::Short_out EncodingFormat_out;
+   
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_typecode/typecode_decl.cpp:44
+-  
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
+   
+   // TAO_IDL - Generated from
+   // be/be_visitor_constant/constant_ch.cpp:52
+@@ -413,10 +405,6 @@
+     CORBA::Octet minor_version;
+   };
+   
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_typecode/typecode_decl.cpp:44
+-  
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
+   
+   // TAO_IDL - Generated from
+   // be/be_interface.cpp:611
+@@ -561,11 +549,6 @@
+ #endif /* end #if !defined */
+   
+   // TAO_IDL - Generated from
+-  // be/be_visitor_typecode/typecode_decl.cpp:44
+-  
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
+-
+-// TAO_IDL - Generated from
+ // be/be_visitor_module/module_ch.cpp:66
+ 
+ } // module IOP
+--- orig/IOP_CodecC.i	2003-12-24 14:12:42.000000000 -0600
++++ IOP_CodecC.i	2003-12-23 21:29:07.000000000 -0600
+@@ -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/IOP_CodecC.cpp	2003-12-24 14:12:42.000000000 -0600
++++ IOP_CodecC.cpp	2003-12-24 14:05:18.000000000 -0600
+@@ -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:
+@@ -192,47 +192,6 @@
+ }
+ 
+ // TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  49,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x632f496e), 
+-  ACE_NTOHL (0x76616c69), 
+-  ACE_NTOHL (0x64547970), 
+-  ACE_NTOHL (0x65466f72), 
+-  ACE_NTOHL (0x456e636f), 
+-  ACE_NTOHL (0x64696e67), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
+-    23,
+-  ACE_NTOHL (0x496e7661), 
+-  ACE_NTOHL (0x6c696454), 
+-  ACE_NTOHL (0x79706546), 
+-  ACE_NTOHL (0x6f72456e), 
+-  ACE_NTOHL (0x636f6469), 
+-  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
+-  0, // member count
+-  };
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
+-    CORBA::tk_except,
+-    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
+-    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
+-    0,
+-    sizeof (IOP::Codec::InvalidTypeForEncoding)
+-  );
+-
+-::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
+-  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
+-
+-// TAO_IDL - Generated from 
+ // be/be_visitor_exception/exception_cs.cpp:63
+ 
+ IOP::Codec::FormatMismatch::FormatMismatch (void)
+@@ -329,43 +288,6 @@
+ }
+ 
+ // TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  41,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x632f466f), 
+-  ACE_NTOHL (0x726d6174), 
+-  ACE_NTOHL (0x4d69736d), 
+-  ACE_NTOHL (0x61746368), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
+-    15,
+-  ACE_NTOHL (0x466f726d), 
+-  ACE_NTOHL (0x61744d69), 
+-  ACE_NTOHL (0x736d6174), 
+-  ACE_NTOHL (0x63680000),  // name = FormatMismatch
+-  0, // member count
+-  };
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
+-    CORBA::tk_except,
+-    sizeof (_oc_IOP_Codec_FormatMismatch),
+-    (char *) &_oc_IOP_Codec_FormatMismatch,
+-    0,
+-    sizeof (IOP::Codec::FormatMismatch)
+-  );
+-
+-::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
+-  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
+-
+-// TAO_IDL - Generated from 
+ // be/be_visitor_exception/exception_cs.cpp:63
+ 
+ IOP::Codec::TypeMismatch::TypeMismatch (void)
+@@ -461,42 +383,6 @@
+   return ::IOP::Codec::_tc_TypeMismatch;
+ }
+ 
+-// TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  39,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x632f5479), 
+-  ACE_NTOHL (0x70654d69), 
+-  ACE_NTOHL (0x736d6174), 
+-  ACE_NTOHL (0x63683a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
+-    13,
+-  ACE_NTOHL (0x54797065), 
+-  ACE_NTOHL (0x4d69736d), 
+-  ACE_NTOHL (0x61746368), 
+-  ACE_NTOHL (0x0),  // name = TypeMismatch
+-  0, // member count
+-  };
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
+-    CORBA::tk_except,
+-    sizeof (_oc_IOP_Codec_TypeMismatch),
+-    (char *) &_oc_IOP_Codec_TypeMismatch,
+-    0,
+-    sizeof (IOP::Codec::TypeMismatch)
+-  );
+-
+-::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
+-  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
+-
+ IOP::Codec::Codec (void)
+ {}
+ 
+@@ -597,152 +483,6 @@
+ }
+ 
+ // TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_Codec[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  26,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x633a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
+-    6,
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x63000000),  // name = Codec
+-  };
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
+-    CORBA::tk_objref,
+-    sizeof (_oc_IOP_Codec),
+-    (char *) &_oc_IOP_Codec,
+-    0,
+-    sizeof (IOP::Codec)
+-  );
+-
+-namespace IOP
+-{
+-  ::CORBA::TypeCode_ptr _tc_Codec =
+-    &_tc_TAO_tc_IOP_Codec;
+-}
 -
- #include "ace/pre.h"
+-// TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
 -
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
+-static const CORBA::Long _oc_IOP_EncodingFormat[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x456e636f), 
+-  ACE_NTOHL (0x64696e67), 
+-  ACE_NTOHL (0x466f726d), 
+-  ACE_NTOHL (0x61743a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+-    15,
+-  ACE_NTOHL (0x456e636f), 
+-  ACE_NTOHL (0x64696e67), 
+-  ACE_NTOHL (0x466f726d), 
+-  ACE_NTOHL (0x61740000),  // name = EncodingFormat
+-    CORBA::tk_short,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
+-    CORBA::tk_alias,
+-    sizeof (_oc_IOP_EncodingFormat),
+-    (char *) &_oc_IOP_EncodingFormat,
+-    0,
+-    sizeof (IOP::EncodingFormat)
+-  );
+-
+-namespace IOP
+-{
+-  ::CORBA::TypeCode_ptr _tc_EncodingFormat =
+-    &_tc_TAO_tc_IOP_EncodingFormat;
+-}
+-
+-// TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_Encoding[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  29,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x456e636f), 
+-  ACE_NTOHL (0x64696e67), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
+-    9,
+-  ACE_NTOHL (0x456e636f), 
+-  ACE_NTOHL (0x64696e67), 
+-  ACE_NTOHL (0x0),  // name = Encoding
+-  3, // member count
+-    7,
+-  ACE_NTOHL (0x666f726d), 
+-  ACE_NTOHL (0x61740000),  // name = format
+-    CORBA::tk_alias, // typecode kind for typedefs
+-  68, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    35,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x494f502f), 
+-    ACE_NTOHL (0x456e636f), 
+-    ACE_NTOHL (0x64696e67), 
+-    ACE_NTOHL (0x466f726d), 
+-    ACE_NTOHL (0x61743a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+-        15,
+-    ACE_NTOHL (0x456e636f), 
+-    ACE_NTOHL (0x64696e67), 
+-    ACE_NTOHL (0x466f726d), 
+-    ACE_NTOHL (0x61740000),  // name = EncodingFormat
+-        CORBA::tk_short,
+-
+-
+-  14,
+-  ACE_NTOHL (0x6d616a6f), 
+-  ACE_NTOHL (0x725f7665), 
+-  ACE_NTOHL (0x7273696f), 
+-  ACE_NTOHL (0x6e000000),  // name = major_version
+-    CORBA::tk_octet,
+-
+-  14,
+-  ACE_NTOHL (0x6d696e6f), 
+-  ACE_NTOHL (0x725f7665), 
+-  ACE_NTOHL (0x7273696f), 
+-  ACE_NTOHL (0x6e000000),  // name = minor_version
+-    CORBA::tk_octet,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
+-    CORBA::tk_struct,
+-    sizeof (_oc_IOP_Encoding),
+-    (char *) &_oc_IOP_Encoding,
+-    0,
+-    sizeof (IOP::Encoding)
+-  );
+-
+-namespace IOP
+-{
+-  ::CORBA::TypeCode_ptr _tc_Encoding =
+-    &_tc_TAO_tc_IOP_Encoding;
+-}
+-
+-// TAO_IDL - Generated from 
+ // be/be_visitor_structure/structure_cs.cpp:66
+ 
+ void 
+@@ -897,44 +637,6 @@
+   return ::IOP::CodecFactory::_tc_UnknownEncoding;
+ }
  
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
+-// TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  49,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x63466163), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x2f556e6b), 
+-  ACE_NTOHL (0x6e6f776e), 
+-  ACE_NTOHL (0x456e636f), 
+-  ACE_NTOHL (0x64696e67), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
+-    16,
+-  ACE_NTOHL (0x556e6b6e), 
+-  ACE_NTOHL (0x6f776e45), 
+-  ACE_NTOHL (0x6e636f64), 
+-  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
+-  0, // member count
+-  };
 -
+-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
+-    CORBA::tk_except,
+-    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
+-    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
+-    0,
+-    sizeof (IOP::CodecFactory::UnknownEncoding)
+-  );
 -
--#include "TAO_Export.h"
-+#include "tao/TAO_Export.h"
-+#include "tao/Any_T.h"
-+#include "tao/VarOut_T.h"
-+#include "tao/Any_T.h"
+-::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
+-  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
+ 
+ IOP::CodecFactory::CodecFactory (void)
+ {}
+@@ -1036,43 +738,6 @@
+ }
+ 
+ // TAO_IDL - Generated from
+-// be/be_visitor_typecode/typecode_defn.cpp:284
+-
+-static const CORBA::Long _oc_IOP_CodecFactory[] =
+-{
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-  33,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x494f502f), 
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x63466163), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
+-    13,
+-  ACE_NTOHL (0x436f6465), 
+-  ACE_NTOHL (0x63466163), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x0),  // name = CodecFactory
+-  };
+-
+-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
+-    CORBA::tk_objref,
+-    sizeof (_oc_IOP_CodecFactory),
+-    (char *) &_oc_IOP_CodecFactory,
+-    0,
+-    sizeof (IOP::CodecFactory)
+-  );
+-
+-namespace IOP
+-{
+-  ::CORBA::TypeCode_ptr _tc_CodecFactory =
+-    &_tc_TAO_tc_IOP_CodecFactory;
+-}
+-
+-// TAO_IDL - Generated from
+ // be/be_visitor_root/root.cpp:1725
+ 
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+--- orig/IOP_CodecA.h	2003-12-24 14:12:42.000000000 -0600
++++ IOP_CodecA.h	2003-12-24 13:58:53.000000000 -0600
+@@ -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:
+@@ -33,6 +33,18 @@
+ 
+ #include /**/ "ace/pre.h"
+ 
++// ==== Handcrafted
++namespace IOP
++{
++  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
++
++  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
++
++  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
++
++  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
++}
++
+ // TAO_IDL - Generated from
+ // be/be_visitor_interface/any_op_ch.cpp:52
+ 
+--- orig/IOP_CodecA.cpp	2003-12-24 14:12:42.000000000 -0600
++++ IOP_CodecA.cpp	2003-12-24 14:05:11.000000000 -0600
+@@ -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:
+@@ -32,6 +32,345 @@
+ #include "tao/Any_Dual_Impl_T.h"
+ 
+ // TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  49,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x632f496e),
++  ACE_NTOHL (0x76616c69),
++  ACE_NTOHL (0x64547970),
++  ACE_NTOHL (0x65466f72),
++  ACE_NTOHL (0x456e636f),
++  ACE_NTOHL (0x64696e67),
++  ACE_NTOHL (0x3a312e30),
++  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
++    23,
++  ACE_NTOHL (0x496e7661),
++  ACE_NTOHL (0x6c696454),
++  ACE_NTOHL (0x79706546),
++  ACE_NTOHL (0x6f72456e),
++  ACE_NTOHL (0x636f6469),
++  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
++  0, // member count
++  };
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
++    CORBA::tk_except,
++    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
++    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
++    0,
++    sizeof (IOP::Codec::InvalidTypeForEncoding)
++  );
++
++::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
++  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  41,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x632f466f),
++  ACE_NTOHL (0x726d6174),
++  ACE_NTOHL (0x4d69736d),
++  ACE_NTOHL (0x61746368),
++  ACE_NTOHL (0x3a312e30),
++  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
++    15,
++  ACE_NTOHL (0x466f726d),
++  ACE_NTOHL (0x61744d69),
++  ACE_NTOHL (0x736d6174),
++  ACE_NTOHL (0x63680000),  // name = FormatMismatch
++  0, // member count
++  };
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
++    CORBA::tk_except,
++    sizeof (_oc_IOP_Codec_FormatMismatch),
++    (char *) &_oc_IOP_Codec_FormatMismatch,
++    0,
++    sizeof (IOP::Codec::FormatMismatch)
++  );
++
++::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
++  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
++
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  39,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x632f5479),
++  ACE_NTOHL (0x70654d69),
++  ACE_NTOHL (0x736d6174),
++  ACE_NTOHL (0x63683a31),
++  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
++    13,
++  ACE_NTOHL (0x54797065),
++  ACE_NTOHL (0x4d69736d),
++  ACE_NTOHL (0x61746368),
++  ACE_NTOHL (0x0),  // name = TypeMismatch
++  0, // member count
++  };
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
++    CORBA::tk_except,
++    sizeof (_oc_IOP_Codec_TypeMismatch),
++    (char *) &_oc_IOP_Codec_TypeMismatch,
++    0,
++    sizeof (IOP::Codec::TypeMismatch)
++  );
++
++::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
++  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
++
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_Codec[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  26,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x633a312e),
++  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
++    6,
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x63000000),  // name = Codec
++  };
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
++    CORBA::tk_objref,
++    sizeof (_oc_IOP_Codec),
++    (char *) &_oc_IOP_Codec,
++    0,
++    sizeof (IOP::Codec)
++  );
++
++namespace IOP
++{
++  ::CORBA::TypeCode_ptr _tc_Codec =
++    &_tc_TAO_tc_IOP_Codec;
++}
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_EncodingFormat[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  35,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x456e636f),
++  ACE_NTOHL (0x64696e67),
++  ACE_NTOHL (0x466f726d),
++  ACE_NTOHL (0x61743a31),
++  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
++    15,
++  ACE_NTOHL (0x456e636f),
++  ACE_NTOHL (0x64696e67),
++  ACE_NTOHL (0x466f726d),
++  ACE_NTOHL (0x61740000),  // name = EncodingFormat
++    CORBA::tk_short,
++
++};
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
++    CORBA::tk_alias,
++    sizeof (_oc_IOP_EncodingFormat),
++    (char *) &_oc_IOP_EncodingFormat,
++    0,
++    sizeof (IOP::EncodingFormat)
++  );
++
++namespace IOP
++{
++  ::CORBA::TypeCode_ptr _tc_EncodingFormat =
++    &_tc_TAO_tc_IOP_EncodingFormat;
++}
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_Encoding[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  29,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x456e636f),
++  ACE_NTOHL (0x64696e67),
++  ACE_NTOHL (0x3a312e30),
++  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
++    9,
++  ACE_NTOHL (0x456e636f),
++  ACE_NTOHL (0x64696e67),
++  ACE_NTOHL (0x0),  // name = Encoding
++  3, // member count
++    7,
++  ACE_NTOHL (0x666f726d),
++  ACE_NTOHL (0x61740000),  // name = format
++    CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a),
++    ACE_NTOHL (0x6f6d672e),
++    ACE_NTOHL (0x6f72672f),
++    ACE_NTOHL (0x494f502f),
++    ACE_NTOHL (0x456e636f),
++    ACE_NTOHL (0x64696e67),
++    ACE_NTOHL (0x466f726d),
++    ACE_NTOHL (0x61743a31),
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
++        15,
++    ACE_NTOHL (0x456e636f),
++    ACE_NTOHL (0x64696e67),
++    ACE_NTOHL (0x466f726d),
++    ACE_NTOHL (0x61740000),  // name = EncodingFormat
++        CORBA::tk_short,
++
++
++  14,
++  ACE_NTOHL (0x6d616a6f),
++  ACE_NTOHL (0x725f7665),
++  ACE_NTOHL (0x7273696f),
++  ACE_NTOHL (0x6e000000),  // name = major_version
++    CORBA::tk_octet,
++
++  14,
++  ACE_NTOHL (0x6d696e6f),
++  ACE_NTOHL (0x725f7665),
++  ACE_NTOHL (0x7273696f),
++  ACE_NTOHL (0x6e000000),  // name = minor_version
++    CORBA::tk_octet,
++
++};
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
++    CORBA::tk_struct,
++    sizeof (_oc_IOP_Encoding),
++    (char *) &_oc_IOP_Encoding,
++    0,
++    sizeof (IOP::Encoding)
++  );
++
++namespace IOP
++{
++  ::CORBA::TypeCode_ptr _tc_Encoding =
++    &_tc_TAO_tc_IOP_Encoding;
++}
++
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  49,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x63466163),
++  ACE_NTOHL (0x746f7279),
++  ACE_NTOHL (0x2f556e6b),
++  ACE_NTOHL (0x6e6f776e),
++  ACE_NTOHL (0x456e636f),
++  ACE_NTOHL (0x64696e67),
++  ACE_NTOHL (0x3a312e30),
++  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
++    16,
++  ACE_NTOHL (0x556e6b6e),
++  ACE_NTOHL (0x6f776e45),
++  ACE_NTOHL (0x6e636f64),
++  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
++  0, // member count
++  };
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
++    CORBA::tk_except,
++    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
++    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
++    0,
++    sizeof (IOP::CodecFactory::UnknownEncoding)
++  );
++
++::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
++  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
++
++// TAO_IDL - Generated from
++// be/be_visitor_typecode/typecode_defn.cpp:284
++
++static const CORBA::Long _oc_IOP_CodecFactory[] =
++{
++    TAO_ENCAP_BYTE_ORDER, // byte order
++  33,
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x494f502f),
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x63466163),
++  ACE_NTOHL (0x746f7279),
++  ACE_NTOHL (0x3a312e30),
++  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
++    13,
++  ACE_NTOHL (0x436f6465),
++  ACE_NTOHL (0x63466163),
++  ACE_NTOHL (0x746f7279),
++  ACE_NTOHL (0x0),  // name = CodecFactory
++  };
++
++static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
++    CORBA::tk_objref,
++    sizeof (_oc_IOP_CodecFactory),
++    (char *) &_oc_IOP_CodecFactory,
++    0,
++    sizeof (IOP::CodecFactory)
++  );
++
++namespace IOP
++{
++  ::CORBA::TypeCode_ptr _tc_CodecFactory =
++    &_tc_TAO_tc_IOP_CodecFactory;
++}
++
++// TAO_IDL - Generated from
+ // be/be_visitor_interface/any_op_cs.cpp:50
  
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
+ ACE_TEMPLATE_SPECIALIZATION