ChangeLogTag:Mon Sep 1 11:08:43 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

9 files changed, 294 insertions, 351 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index f1174efd0cc..85958a90846 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,16 @@
+Mon Sep  1 11:08:43 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/CurrentC.h: Removed inclusion of Object_T.h.
+	
+	* tao/CurrentC.cpp (_is_a): Fixed a unused variable warning. 
+
+	* tao/Object_T.cpp: #include'd Stub.h
+
+	* tao/Invocation_Base.cpp: Rearranged initialization list to
+	  prevent warnings from gcc.
+
+	* tao/IOP_CodecC.*: Regenerated the handcrafted files. 
+
 Mon Sep  1 10:43:00 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp (visit_interface): 
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 0702cfb2e4d..174adacca8f 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -84,7 +84,7 @@ TAO::Objref_Traits<CORBA::Current>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -114,14 +114,14 @@ CORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 CORBA::Boolean
 CORBA::Current::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (
@@ -165,16 +165,16 @@ static const CORBA::Long _oc_CORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4375), 
-  ACE_NTOHL (0x7272656e), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4375),
+  ACE_NTOHL (0x7272656e),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
     8,
-  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -202,7 +202,7 @@ namespace CORBA
         CORBA::Current,
         TAO::Objref_Traits<CORBA::Current>
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         CORBA::Current,
@@ -216,12 +216,11 @@ namespace CORBA
         CORBA::Current, \
         TAO::Objref_Traits<CORBA::Current> \
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Current, \
         TAO::Objref_Traits<CORBA::Current> \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 04221a7b620..349e4daef4d 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -39,7 +39,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Object_T.h"
 #include "tao/Objref_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -65,7 +64,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
@@ -78,22 +77,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
 #define _CORBA_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -101,60 +100,60 @@ namespace CORBA
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
-  
+
   class TAO_Export Current
     : public virtual CORBA::Object
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
-    
+
     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:
     Current (void);
     virtual ~Current (void);
-  
+
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
 // TAO_IDL - Generated from
@@ -197,4 +196,3 @@ namespace TAO
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index cd45c0ea815..16880dd5ad6 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -26,12 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301
+// be/be_codegen.cpp:301
 
 
 #include "IOP_CodecC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
@@ -49,14 +50,14 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+// be/be_visitor_arg_traits.cpp:59
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+  // be/be_visitor_arg_traits.cpp:262
 
 #if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
 #define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
@@ -92,7 +93,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+  // be/be_visitor_arg_traits.cpp:428
 
 #if !defined (_IOP_ENCODING__ARG_TRAITS_CS_)
 #define _IOP_ENCODING__ARG_TRAITS_CS_
@@ -110,7 +111,7 @@ namespace TAO
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for IOP::Codec.
 
@@ -152,7 +153,7 @@ TAO::Collocation_Proxy_Broker *
   ) = 0;
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
   : CORBA::UserException (
@@ -248,7 +249,7 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
 {
@@ -289,7 +290,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
   &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::FormatMismatch::FormatMismatch (void)
   : CORBA::UserException (
@@ -385,7 +386,7 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
 {
@@ -422,7 +423,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
   &_tc_TAO_tc_IOP_Codec_FormatMismatch;
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::TypeMismatch::TypeMismatch (void)
   : CORBA::UserException (
@@ -518,7 +519,7 @@ CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
 {
@@ -593,7 +594,7 @@ IOP::Codec::_duplicate (Codec_ptr obj)
 CORBA::Boolean
 IOP::Codec::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (
@@ -631,7 +632,7 @@ IOP::Codec::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_Codec[] =
 {
@@ -664,7 +665,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_EncodingFormat[] =
 {
@@ -703,7 +704,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_Encoding[] =
 {
@@ -777,7 +778,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+// be/be_visitor_structure/structure_cs.cpp:66
 
 void 
 IOP::Encoding::_tao_any_destructor (
@@ -790,7 +791,7 @@ IOP::Encoding::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for IOP::CodecFactory.
 
@@ -832,7 +833,7 @@ TAO::Collocation_Proxy_Broker *
   ) = 0;
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
   : CORBA::UserException (
@@ -928,7 +929,7 @@ CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
 {
@@ -1006,7 +1007,7 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
 CORBA::Boolean
 IOP::CodecFactory::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (
@@ -1044,7 +1045,7 @@ IOP::CodecFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_CodecFactory[] =
 {
@@ -1081,7 +1082,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -1125,8 +1126,32 @@ operator>>= (
       );
 }
 
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::Codec>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1184,7 +1209,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -1228,8 +1253,32 @@ operator>>= (
       );
 }
 
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::CodecFactory>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1703
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index 3d3f779284a..d74ddf5e588 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -26,12 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
 #define _TAO_IDL_ORIG_IOP_CODECC_H_
 
-#include "ace/pre.h"
+#include /**/ "ace/pre.h"
 
 #include "tao/corbafwd.h"
 
@@ -39,13 +39,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Object.h"
-#include "tao/Object_T.h"
+
+#include "TAO_Export.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/Any.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -70,8 +71,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from
+// be/be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
@@ -79,26 +80,26 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 namespace IOP
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
+  // be/be_interface.cpp:601
 
 #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
@@ -106,53 +107,53 @@ namespace IOP
     Codec_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #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 _nil (void)
       {
         return (Codec_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+    // 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);
 
@@ -164,43 +165,43 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+      // be/be_visitor_exception/exception_ch.cpp:125
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+
     static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+    // 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);
 
@@ -212,43 +213,43 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+      // be/be_visitor_exception/exception_ch.cpp:125
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+
     static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+    // 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);
 
@@ -260,28 +261,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+      // be/be_visitor_exception/exception_ch.cpp:125
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+
     static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual ::CORBA::OctetSeq * encode (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -290,10 +291,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::Any * decode (
         const CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -302,10 +303,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::FormatMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual ::CORBA::OctetSeq * encode_value (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -314,10 +315,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
         CORBA::TypeCode_ptr tc
@@ -328,98 +329,98 @@ namespace IOP
         , IOP::Codec::FormatMismatch
         , IOP::Codec::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
-    
+    // be/be_visitor_interface/interface_ch.cpp:185
+
     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:
     Codec (void);
     virtual ~Codec (void);
-  
+
   private:
     Codec (const Codec &);
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
-  
+  // be/be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
+  // be/be_visitor_constant/constant_ch.cpp:52
+
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-  
+  // be/be_type.cpp:258
+
   struct Encoding;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-  
+
   typedef
     Encoding &
     Encoding_out;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-  
+  // 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
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
+  // be/be_interface.cpp:601
 
 #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
@@ -427,53 +428,53 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #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 _nil (void)
       {
         return (CodecFactory_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+    // 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);
 
@@ -485,28 +486,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+      // be/be_visitor_exception/exception_ch.cpp:125
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+
     static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual ::IOP::Codec_ptr create_codec (
         const IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -515,41 +516,41 @@ namespace IOP
         CORBA::SystemException
         , IOP::CodecFactory::UnknownEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
-    
+    // be/be_visitor_interface/interface_ch.cpp:185
+
     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:
     CodecFactory (void);
     virtual ~CodecFactory (void);
-  
+
   private:
     CodecFactory (const CodecFactory &);
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:66
 
 } // module IOP
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+// be/be_visitor_traits.cpp:48
 
 // Traits specializations.
 namespace TAO
@@ -557,14 +558,14 @@ namespace TAO
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version
@@ -572,7 +573,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTy
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version
@@ -580,7 +581,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMis
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version
@@ -588,7 +589,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMisma
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
@@ -596,14 +597,14 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); //
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version
@@ -611,23 +612,23 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::Un
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
+// be/be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "IOP_CodecC.i"
@@ -641,6 +642,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 #pragma option pop
 #endif /* __BORLANDC__ */
 
-#include "ace/post.h"
+#include /**/ "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/IOP_CodecC.i b/TAO/tao/IOP_CodecC.i
index 15db319f637..222d16daace 100644
--- a/TAO/tao/IOP_CodecC.i
+++ b/TAO/tao/IOP_CodecC.i
@@ -26,142 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_IOP_CODEC___CI_)
 #define _IOP_CODEC___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<IOP::Codec>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_IOP_CODECFACTORY___CI_)
 #define _IOP_CODECFACTORY___CI_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<IOP::CodecFactory>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 4238da0f07b..78ada6b3423 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -24,13 +24,13 @@ namespace TAO
                                     bool response_expected)
     : details_ (details)
     , forwarded_to_ (0)
+    , response_expected_ (response_expected)
     , otarget_ (ot)
     , target_ (t)
 #if TAO_HAS_INTERCEPTORS == 1
     , adapter_ (t->_stubobj ()->orb_core ()->client_request_interceptors (),
                 this)
     , req_info_ (this)
-    , response_expected_ (response_expected)
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
   {
     ACE_UNUSED_ARG (response_expected);
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 20904814ab4..ae633a25d43 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -2,8 +2,8 @@
 #ifndef TAO_OBJECT_T_C
 #define TAO_OBJECT_T_C
 
-#include "tao/Object_T.h"
-
+#include "Object_T.h"
+#include "Stub.h"
 ACE_RCSID (tao,
            Object_T,
            "$Id$")
@@ -21,16 +21,16 @@ namespace TAO
       {
         return T::_nil ();
       }
-  
+
     CORBA::Boolean is_it = obj->_is_a (repo_id
                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (T::_nil ());
-  
+
     if (is_it == 0)
       {
         return T::_nil ();
       }
-  
+
     return TAO::Narrow_Utils<T>::unchecked_narrow (obj, pbf);
   }
 
@@ -44,19 +44,19 @@ namespace TAO
       {
         return T::_nil ();
       }
-  
+
     CORBA::Boolean is_it =
       obj->_is_a (
           repo_id
           ACE_ENV_ARG_PARAMETER
         );
     ACE_CHECK_RETURN (T::_nil ());
-  
+
     if (is_it == 0)
       {
         return T::_nil ();
       }
-  
+
     return Narrow_Utils<T>::unchecked_narrow (obj);
   }
 
@@ -64,7 +64,7 @@ namespace TAO
   T *
   Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj,
                                      Proxy_Broker_Factory pbf)
-  {  
+  {
     T_ptr proxy = Narrow_Utils<T>::lazy_evaluation (obj);
 
     if (!CORBA::is_nil (proxy))
@@ -73,7 +73,7 @@ namespace TAO
       }
 
     TAO_Stub* stub = obj->_stubobj ();
-    
+
     if (stub != 0)
       {
         stub->_incr_refcnt ();
@@ -84,13 +84,13 @@ namespace TAO
       && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()
       && obj->_is_collocated ()
       && pbf != 0;
-    
+
     ACE_NEW_RETURN (proxy,
                     T (stub,
                        collocated ? 1 : 0,
                        obj->_servant ()),
                     T::_nil ());
-    
+
     return proxy;
   }
 
@@ -99,7 +99,7 @@ namespace TAO
   Narrow_Utils<T>::unchecked_narrow (CORBA::AbstractBase_ptr obj)
   {
     T_ptr proxy = T::_nil ();
-  
+
     if (obj->_is_objref ())
       {
         ACE_NEW_RETURN (proxy,
@@ -113,7 +113,7 @@ namespace TAO
         proxy = T::_downcast (obj);
         proxy->_add_ref ();
       }
-  
+
     return proxy;
   }
 
@@ -122,7 +122,7 @@ namespace TAO
   Narrow_Utils<T>::lazy_evaluation (CORBA::Object_ptr obj)
   {
     T_ptr default_proxy = T::_nil ();
-  
+
     // Code for lazily evaluated IORs.
     if (!obj->is_evaluated ())
       {
@@ -131,7 +131,7 @@ namespace TAO
                            obj->orb_core ()),
                         T::_nil ());
       }
-      
+
     return default_proxy;
   }
 }
diff --git a/TAO/tao/TODO b/TAO/tao/TODO
index e6e0f9f202f..a845929d5d8 100644
--- a/TAO/tao/TODO
+++ b/TAO/tao/TODO
@@ -50,3 +50,5 @@
 . Different versions of GIOP
 
 . What about AMH
+
+. local interfaces and the generation of Arg_Traits
\ No newline at end of file