ChangeLogTag: Tue Jun 14 07:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 2437 insertions, 2 deletions

diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 617f57d299d..f89f4bca6bf 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IOP_CodecC.h"
+#include "IOP_Codec_includeC.h"
 #include "tao/LocalObject.h"
 
 /**
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 2961204afbb..d04eb263184 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -58,6 +58,10 @@ TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
+#define TAO_CODECFACTORY_SAFE_INCLUDE
+#include "IOP_CodecC.h"
+#undef TAO_CODECFACTORY_SAFE_INCLUDE
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODECFACTORY_H */
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 4a70de5fd74..785a1eec9d6 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "tao/IOP_CodecC.h"
+#include "IOP_Codec_includeC.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl
new file mode 100644
index 00000000000..d322ae98bc1
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_Codec.pidl
@@ -0,0 +1,63 @@
+// -*- IDL -*-
+
+/**
+ * @file IOP_Codec.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the IOP module.
+ *
+ * This file is used to generate IOPC.{h,cpp}, using the following
+ * command:
+ *
+ *   tao_idl.exe
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
+ *        -Wb,export_macro=TAO_Export
+ *        -Wb,export_include=tao/TAO_Export.h
+ *        -Wb,pre_include="ace/pre.h"
+ *        -Wb,post_include="ace/post.h"
+ *        IOP_Codec.pidl
+ *
+ */
+
+#ifndef TAO_IOP_CODEC_PIDL
+#define TAO_IOP_CODEC_PIDL
+
+#include <Typecode_types.pidl>
+#include <OctetSeq.pidl>
+
+#pragma prefix "omg.org"
+
+module IOP
+{
+  local interface Codec {
+    exception InvalidTypeForEncoding {};
+    exception FormatMismatch {};
+    exception TypeMismatch {};
+
+    CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
+    any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
+    CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
+    any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
+      raises (FormatMismatch, TypeMismatch);
+  };
+
+  typedef short EncodingFormat;
+  const EncodingFormat ENCODING_CDR_ENCAPS = 0;
+
+  struct Encoding {
+    EncodingFormat format;
+    octet major_version;
+    octet minor_version;
+  };
+
+  local interface CodecFactory {
+    exception UnknownEncoding {};
+
+    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
+  };
+};
+
+#pragma prefix ""
+
+#endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp
new file mode 100644
index 00000000000..5c5a791f7e2
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_CodecA.cpp
@@ -0,0 +1,704 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "CodecFactory.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode_Static.h"
+#include "tao/Objref_TypeCode_Static.h"
+#include "tao/Struct_TypeCode_Static.h"
+#include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_InvalidTypeForEncoding (
+    CORBA::tk_except,
+    "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+    "InvalidTypeForEncoding",
+    _tao_fields_IOP_Codec_InvalidTypeForEncoding,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
+  &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_FormatMismatch (
+    CORBA::tk_except,
+    "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+    "FormatMismatch",
+    _tao_fields_IOP_Codec_FormatMismatch,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
+  &_tao_tc_IOP_Codec_FormatMismatch;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_TypeMismatch (
+    CORBA::tk_except,
+    "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+    "TypeMismatch",
+    _tao_fields_IOP_Codec_TypeMismatch,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
+  &_tao_tc_IOP_Codec_TypeMismatch;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec (
+    CORBA::tk_local_interface,
+    "IDL:omg.org/IOP/Codec:1.0",
+    "Codec");
+  
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Codec =
+    &_tao_tc_IOP_Codec;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_EncodingFormat (
+    CORBA::tk_alias,
+    "IDL:omg.org/IOP/EncodingFormat:1.0",
+    "EncodingFormat",
+    &CORBA::_tc_short);
+  
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
+    &_tao_tc_IOP_EncodingFormat;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] =
+  {
+    { "format", &IOP::_tc_EncodingFormat },
+    { "major_version", &CORBA::_tc_octet },
+    { "minor_version", &CORBA::_tc_octet }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Encoding (
+    CORBA::tk_struct,
+    "IDL:omg.org/IOP/Encoding:1.0",
+    "Encoding",
+    _tao_fields_IOP_Encoding,
+    3);
+  
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Encoding =
+    &_tao_tc_IOP_Encoding;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory_UnknownEncoding (
+    CORBA::tk_except,
+    "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+    "UnknownEncoding",
+    _tao_fields_IOP_CodecFactory_UnknownEncoding,
+    0);
+  
+::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
+  &_tao_tc_IOP_CodecFactory_UnknownEncoding;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory (
+    CORBA::tk_local_interface,
+    "IDL:omg.org/IOP/CodecFactory:1.0",
+    "CodecFactory");
+  
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_CodecFactory =
+    &_tao_tc_IOP_CodecFactory;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<IOP::Codec>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec_ptr _tao_elem
+  )
+{
+  IOP::Codec_ptr _tao_objptr =
+    IOP::Codec::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<IOP::Codec>::insert (
+      _tao_any,
+      IOP::Codec::_tao_any_destructor,
+      IOP::_tc_Codec,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Codec_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<IOP::Codec>::extract (
+        _tao_any,
+        IOP::Codec::_tao_any_destructor,
+        IOP::_tc_Codec,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Codec::InvalidTypeForEncoding &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert_copy (
+      _tao_any,
+      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
+      IOP::Codec::_tc_InvalidTypeForEncoding,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec::InvalidTypeForEncoding *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert (
+      _tao_any,
+      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
+      IOP::Codec::_tc_InvalidTypeForEncoding,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Codec::InvalidTypeForEncoding *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::Codec::InvalidTypeForEncoding *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Codec::InvalidTypeForEncoding *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::extract (
+        _tao_any,
+        IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
+        IOP::Codec::_tc_InvalidTypeForEncoding,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Codec::FormatMismatch &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert_copy (
+      _tao_any,
+      IOP::Codec::FormatMismatch::_tao_any_destructor,
+      IOP::Codec::_tc_FormatMismatch,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec::FormatMismatch *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert (
+      _tao_any,
+      IOP::Codec::FormatMismatch::_tao_any_destructor,
+      IOP::Codec::_tc_FormatMismatch,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Codec::FormatMismatch *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::Codec::FormatMismatch *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Codec::FormatMismatch *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::extract (
+        _tao_any,
+        IOP::Codec::FormatMismatch::_tao_any_destructor,
+        IOP::Codec::_tc_FormatMismatch,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Codec::TypeMismatch &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert_copy (
+      _tao_any,
+      IOP::Codec::TypeMismatch::_tao_any_destructor,
+      IOP::Codec::_tc_TypeMismatch,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec::TypeMismatch *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert (
+      _tao_any,
+      IOP::Codec::TypeMismatch::_tao_any_destructor,
+      IOP::Codec::_tc_TypeMismatch,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Codec::TypeMismatch *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::Codec::TypeMismatch *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Codec::TypeMismatch *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::extract (
+        _tao_any,
+        IOP::Codec::TypeMismatch::_tao_any_destructor,
+        IOP::Codec::_tc_TypeMismatch,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Encoding &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy (
+      _tao_any,
+      IOP::Encoding::_tao_any_destructor,
+      IOP::_tc_Encoding,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Encoding *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert (
+      _tao_any,
+      IOP::Encoding::_tao_any_destructor,
+      IOP::_tc_Encoding,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Encoding *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::Encoding *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Encoding *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::Encoding>::extract (
+        _tao_any,
+        IOP::Encoding::_tao_any_destructor,
+        IOP::_tc_Encoding,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<IOP::CodecFactory>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::CodecFactory_ptr _tao_elem
+  )
+{
+  IOP::CodecFactory_ptr _tao_objptr =
+    IOP::CodecFactory::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::CodecFactory_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<IOP::CodecFactory>::insert (
+      _tao_any,
+      IOP::CodecFactory::_tao_any_destructor,
+      IOP::_tc_CodecFactory,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::CodecFactory_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<IOP::CodecFactory>::extract (
+        _tao_any,
+        IOP::CodecFactory::_tao_any_destructor,
+        IOP::_tc_CodecFactory,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
+  {
+    return false;
+  }
+  
+  template<>
+  CORBA::Boolean
+  Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
+  {
+    return false;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::CodecFactory::UnknownEncoding &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert_copy (
+      _tao_any,
+      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
+      IOP::CodecFactory::_tc_UnknownEncoding,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::CodecFactory::UnknownEncoding *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert (
+      _tao_any,
+      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
+      IOP::CodecFactory::_tc_UnknownEncoding,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::CodecFactory::UnknownEncoding *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::CodecFactory::UnknownEncoding *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::CodecFactory::UnknownEncoding *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::extract (
+        _tao_any,
+        IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
+        IOP::CodecFactory::_tc_UnknownEncoding,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.cpp b/TAO/tao/CodecFactory/IOP_CodecC.cpp
new file mode 100644
index 00000000000..965d8fb585e
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_CodecC.cpp
@@ -0,0 +1,748 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:291
+
+
+#include "CodecFactory.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:69
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for IOP::Codec.
+
+IOP::Codec_ptr
+TAO::Objref_Traits<IOP::Codec>::duplicate (
+    IOP::Codec_ptr p
+  )
+{
+  return IOP::Codec::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<IOP::Codec>::release (
+    IOP::Codec_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IOP::Codec_ptr
+TAO::Objref_Traits<IOP::Codec>::nil (void)
+{
+  return IOP::Codec::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<IOP::Codec>::marshal (
+    IOP::Codec_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/exception_cs.cpp:63
+
+IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+        "InvalidTypeForEncoding"
+      )
+{
+}
+
+IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
+{
+}
+
+IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+IOP::Codec::InvalidTypeForEncoding&
+IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidTypeForEncoding *_tao_tmp_pointer =
+    static_cast<InvalidTypeForEncoding *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+IOP::Codec::InvalidTypeForEncoding *
+IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<InvalidTypeForEncoding *> (_tao_excp);
+}
+
+const IOP::Codec::InvalidTypeForEncoding *
+IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidTypeForEncoding *> (_tao_excp);
+}
+
+CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0);
+  return retval;
+}
+
+CORBA::Exception *
+IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::IOP::Codec::InvalidTypeForEncoding (*this),
+      0
+    );
+  return result;
+}
+
+void IOP::Codec::InvalidTypeForEncoding::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const
+{
+  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/exception_cs.cpp:63
+
+IOP::Codec::FormatMismatch::FormatMismatch (void)
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+        "FormatMismatch"
+      )
+{
+}
+
+IOP::Codec::FormatMismatch::~FormatMismatch (void)
+{
+}
+
+IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+IOP::Codec::FormatMismatch&
+IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
+{
+  FormatMismatch *_tao_tmp_pointer =
+    static_cast<FormatMismatch *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+IOP::Codec::FormatMismatch *
+IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<FormatMismatch *> (_tao_excp);
+}
+
+const IOP::Codec::FormatMismatch *
+IOP::Codec::FormatMismatch::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const FormatMismatch *> (_tao_excp);
+}
+
+CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0);
+  return retval;
+}
+
+CORBA::Exception *
+IOP::Codec::FormatMismatch::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::IOP::Codec::FormatMismatch (*this),
+      0
+    );
+  return result;
+}
+
+void IOP::Codec::FormatMismatch::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void IOP::Codec::FormatMismatch::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void IOP::Codec::FormatMismatch::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const
+{
+  return ::IOP::Codec::_tc_FormatMismatch;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/exception_cs.cpp:63
+
+IOP::Codec::TypeMismatch::TypeMismatch (void)
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+        "TypeMismatch"
+      )
+{
+}
+
+IOP::Codec::TypeMismatch::~TypeMismatch (void)
+{
+}
+
+IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+IOP::Codec::TypeMismatch&
+IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TypeMismatch *_tao_tmp_pointer =
+    static_cast<TypeMismatch *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+IOP::Codec::TypeMismatch *
+IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<TypeMismatch *> (_tao_excp);
+}
+
+const IOP::Codec::TypeMismatch *
+IOP::Codec::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const TypeMismatch *> (_tao_excp);
+}
+
+CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0);
+  return retval;
+}
+
+CORBA::Exception *
+IOP::Codec::TypeMismatch::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::IOP::Codec::TypeMismatch (*this),
+      0
+    );
+  return result;
+}
+
+void IOP::Codec::TypeMismatch::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void IOP::Codec::TypeMismatch::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void IOP::Codec::TypeMismatch::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const
+{
+  return ::IOP::Codec::_tc_TypeMismatch;
+}
+
+IOP::Codec::Codec (void)
+{}
+
+IOP::Codec::~Codec (void)
+{}
+
+void
+IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Codec *_tao_tmp_pointer =
+    static_cast<Codec *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+IOP::Codec_ptr
+IOP::Codec::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Codec::_nil ();
+    }
+
+  Codec_ptr proxy =
+    dynamic_cast<Codec_ptr> (_tao_objref);
+
+  return Codec::_duplicate (proxy);
+}
+
+IOP::Codec_ptr
+IOP::Codec::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Codec::_nil ();
+    }
+
+  Codec_ptr proxy =
+    dynamic_cast<Codec_ptr> (_tao_objref);
+
+  return Codec::_duplicate (proxy);
+}
+
+IOP::Codec_ptr
+IOP::Codec::_duplicate (Codec_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+void
+IOP::Codec::_tao_release (Codec_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+IOP::Codec::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/IOP/Codec:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return true; // success using local knowledge
+    }
+  else
+    {
+      return false;
+    }
+}
+
+const char* IOP::Codec::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/IOP/Codec:1.0";
+}
+
+CORBA::Boolean
+IOP::Codec::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void
+IOP::Encoding::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  Encoding *_tao_tmp_pointer =
+    static_cast<Encoding *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for IOP::CodecFactory.
+
+IOP::CodecFactory_ptr
+TAO::Objref_Traits<IOP::CodecFactory>::duplicate (
+    IOP::CodecFactory_ptr p
+  )
+{
+  return IOP::CodecFactory::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<IOP::CodecFactory>::release (
+    IOP::CodecFactory_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IOP::CodecFactory_ptr
+TAO::Objref_Traits<IOP::CodecFactory>::nil (void)
+{
+  return IOP::CodecFactory::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<IOP::CodecFactory>::marshal (
+    IOP::CodecFactory_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/exception_cs.cpp:63
+
+IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+        "UnknownEncoding"
+      )
+{
+}
+
+IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
+{
+}
+
+IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+IOP::CodecFactory::UnknownEncoding&
+IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_pointer)
+{
+  UnknownEncoding *_tao_tmp_pointer =
+    static_cast<UnknownEncoding *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+IOP::CodecFactory::UnknownEncoding *
+IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<UnknownEncoding *> (_tao_excp);
+}
+
+const IOP::CodecFactory::UnknownEncoding *
+IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const UnknownEncoding *> (_tao_excp);
+}
+
+CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0);
+  return retval;
+}
+
+CORBA::Exception *
+IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::IOP::CodecFactory::UnknownEncoding (*this),
+      0
+    );
+  return result;
+}
+
+void IOP::CodecFactory::UnknownEncoding::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void IOP::CodecFactory::UnknownEncoding::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void IOP::CodecFactory::UnknownEncoding::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const
+{
+  return ::IOP::CodecFactory::_tc_UnknownEncoding;
+}
+
+IOP::CodecFactory::CodecFactory (void)
+{}
+
+IOP::CodecFactory::~CodecFactory (void)
+{}
+
+void
+IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
+{
+  CodecFactory *_tao_tmp_pointer =
+    static_cast<CodecFactory *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+IOP::CodecFactory_ptr
+IOP::CodecFactory::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return CodecFactory::_nil ();
+    }
+
+  CodecFactory_ptr proxy =
+    dynamic_cast<CodecFactory_ptr> (_tao_objref);
+
+  return CodecFactory::_duplicate (proxy);
+}
+
+IOP::CodecFactory_ptr
+IOP::CodecFactory::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return CodecFactory::_nil ();
+    }
+
+  CodecFactory_ptr proxy =
+    dynamic_cast<CodecFactory_ptr> (_tao_objref);
+
+  return CodecFactory::_duplicate (proxy);
+}
+
+IOP::CodecFactory_ptr
+IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+void
+IOP::CodecFactory::_tao_release (CodecFactory_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+IOP::CodecFactory::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/IOP/CodecFactory:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return true; // success using local knowledge
+    }
+  else
+    {
+      return false;
+    }
+}
+
+const char* IOP::CodecFactory::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/IOP/CodecFactory:1.0";
+}
+
+CORBA::Boolean
+IOP::CodecFactory::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::Encoding &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.format) &&
+    (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) &&
+    (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version));
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::Encoding &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.format) &&
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version));
+}
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h
new file mode 100644
index 00000000000..d17987c45bf
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_CodecC.h
@@ -0,0 +1,700 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
+#define _TAO_IDL_ORIG_IOP_CODECC_H_
+
+#include /**/ "ace/pre.h"
+
+#ifndef TAO_CODECFACTORY_SAFE_INCLUDE
+#error "You should not include IOP_CodecC.h directly, use CodecFactory.h"
+#endif /* !TAO_CODECFACTORY_SAFE_INCLUDE */
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CodecFactory/codecfactory_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/TypeCode.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Any.h"
+#include "tao/TypeCode.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/VarOut_T.h"
+
+#include "tao/Typecode_typesC.h"
+#include "tao/OctetSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_CodecFactory_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace IOP
+{
+
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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
+      >
+    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_CodecFactory_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 void _tao_release (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 static_cast<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_CodecFactory_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 const InvalidTypeForEncoding *_downcast (CORBA::Exception const *);
+
+      static CORBA::Exception *_alloc (void);
+
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          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:127
+
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+
+    static ::CORBA::TypeCode_ptr const _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_CodecFactory_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 const FormatMismatch *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          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:127
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _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_CodecFactory_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 const TypeMismatch *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          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:127
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _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
+      )
+      ACE_THROW_SPEC ((
+        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
+      )
+      ACE_THROW_SPEC ((
+        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
+      )
+      ACE_THROW_SPEC ((
+        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
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::IOP::Codec::FormatMismatch,
+        ::IOP::Codec::TypeMismatch
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
+    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
+  
+  extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Codec;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
+  typedef CORBA::Short EncodingFormat;
+  typedef CORBA::Short_out EncodingFormat_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _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_CodecFactory_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
+  
+  extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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
+      >
+    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_CodecFactory_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 void _tao_release (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 static_cast<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_CodecFactory_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 const UnknownEncoding *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          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:127
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _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
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::IOP::CodecFactory::UnknownEncoding
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
+    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
+  
+  extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module IOP
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_IOP_CODEC__TRAITS_CH_)
+#define _IOP_CODEC__TRAITS_CH_
+  
+  template<>
+  struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec>
+  {
+    static ::IOP::Codec_ptr duplicate (
+        ::IOP::Codec_ptr
+      );
+    static void release (
+        ::IOP::Codec_ptr
+      );
+    static ::IOP::Codec_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::IOP::Codec_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
+#define _IOP_CODECFACTORY__TRAITS_CH_
+  
+  template<>
+  struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory>
+  {
+    static ::IOP::CodecFactory_ptr duplicate (
+        ::IOP::CodecFactory_ptr
+      );
+    static void release (
+        ::IOP::CodecFactory_ptr
+      );
+    static ::IOP::CodecFactory_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::IOP::CodecFactory_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTypeForEncoding *&); // deprecated
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMismatch *&); // deprecated
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMismatch *&); // deprecated
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version
+TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::UnknownEncoding *&); // deprecated
+TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_CodecFactory_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
+TAO_CodecFactory_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:955
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/CodecFactory/IOP_CodecS.h b/TAO/tao/CodecFactory/IOP_CodecS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_CodecS.h
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
new file mode 100644
index 00000000000..abac98ff365
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
@@ -0,0 +1,40 @@
+/**
+ * @file IOP_Codec.pidl
+ *
+ * $Id$
+ *
+ * @brief Include file for use in applications that need IOP_Codec.pidl.
+ *
+ * This file just includes IOP_Codec.pidl. The *C.h file generated from
+ * this is hand-crafted to itself include CodecFactory.h instead of
+ * IOP_CodecC.h (which will produce a compiler error message if
+ * included directly). The IOP_Codec_includeC.h file can then be
+ * included directly and automatically by the IDL compiler when
+ * building the application.
+ *
+ *   1. Run the tao_idl compiler on the pidl file.  The command used for
+ *     this is:
+ *
+ *     tao_idl -o orig -St -Sc -Sp -Sci -SS
+ *          -Wb,export_macro=TAO_CodecFactory_Export \
+ *          -Wb,export_include="tao/CodecFactory/codecfactory_export.h" \
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          IOP_Codec_include.pidl
+ *
+ *   2. Then change this line in IOP_Codec_includeC.h:
+ *
+ *          #include "IOP_CodecC.h"
+ *
+ *      to
+ *
+ *          #include "CodecFactory.h"
+ */
+
+#ifndef _IOP_CODEC_INCLUDE_IDL_
+#define _IOP_CODEC_INCLUDE_IDL_
+
+///FUZZ: disable check_for_include/
+#include <tao/CodecFactory/IOP_Codec.pidl>
+
+#endif /* _IOP_CODEC_INCLUDE_IDL_ */
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h
new file mode 100644
index 00000000000..27a39ea7f24
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_Codec_includeC.h
@@ -0,0 +1,86 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
+#define _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CodecFactory/codecfactory_export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+
+#include "tao/CodecFactory/CodecFactory.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_CodecFactory_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:955
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeS.h b/TAO/tao/CodecFactory/IOP_Codec_includeS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_Codec_includeS.h
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/CodecFactory/diff/IOP_Codec.diff b/TAO/tao/CodecFactory/diff/IOP_Codec.diff
new file mode 100644
index 00000000000..46a67dc755f
--- /dev/null
+++ b/TAO/tao/CodecFactory/diff/IOP_Codec.diff
@@ -0,0 +1,34 @@
+--- orig/IOP_COdecC.h	2005-06-07 13:09:58.255201600 +0200
++++ IOP_COdecC.h	2005-06-07 13:45:14.618382400 +0200
+@@ -33,6 +33,9 @@
+ 
+ #include /**/ "ace/pre.h"
+ 
++#ifndef TAO_CODECFACTORY_SAFE_INCLUDE
++#error "You should not include IOP_CodecC.h directly, use CodecFactory.h"
++#endif /* !TAO_CODECFACTORY_SAFE_INCLUDE */
+ 
+ #include "ace/config-all.h"
+ 
+--- orig/IOP_COdecC.cpp	2005-06-07 13:09:58.255201600 +0200
++++ IOP_COdecC.cpp	2005-06-07 13:43:36.437204800 +0200
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:291
+ 
+ 
+-#include "IOP_CodecC.h"
++#include "CodecFactory.h"
+ #include "tao/CDR.h"
+ #include "tao/ORB_Core.h"
+ #include "ace/OS_NS_string.h"
+--- orig/IOP_COdecA.cpp	2005-06-07 13:09:58.255201600 +0200
++++ IOP_COdecA.cpp	2005-06-07 13:43:11.170873600 +0200
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "IOP_CodecC.h"
++#include "CodecFactory.h"
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+ #include "tao/Alias_TypeCode_Static.h"