ChangeLogTag Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 130 insertions, 130 deletions

diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 35905f4fbe5..fbe180bde84 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -6,14 +6,14 @@
 
 #include "tao/CDR.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp
index 5c5a791f7e2..2e54165d86c 100644
--- a/TAO/tao/CodecFactory/IOP_CodecA.cpp
+++ b/TAO/tao/CodecFactory/IOP_CodecA.cpp
@@ -26,17 +26,17 @@
 //     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/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/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"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -52,7 +52,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidTypeForEncoding",
     _tao_fields_IOP_Codec_InvalidTypeForEncoding,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
   &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
 
@@ -70,7 +70,7 @@ static TAO::TypeCode::Struct<char const *,
     "FormatMismatch",
     _tao_fields_IOP_Codec_FormatMismatch,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
   &_tao_tc_IOP_Codec_FormatMismatch;
 
@@ -88,7 +88,7 @@ static TAO::TypeCode::Struct<char const *,
     "TypeMismatch",
     _tao_fields_IOP_Codec_TypeMismatch,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
   &_tao_tc_IOP_Codec_TypeMismatch;
 
@@ -101,7 +101,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/IOP/Codec:1.0",
     "Codec");
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Codec =
@@ -121,7 +121,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/IOP/EncodingFormat:1.0",
     "EncodingFormat",
     &CORBA::_tc_short);
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
@@ -138,7 +138,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "format", &IOP::_tc_EncodingFormat },
     { "major_version", &CORBA::_tc_octet },
     { "minor_version", &CORBA::_tc_octet }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -150,7 +150,7 @@ static TAO::TypeCode::Struct<char const *,
     "Encoding",
     _tao_fields_IOP_Encoding,
     3);
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Encoding =
@@ -173,7 +173,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnknownEncoding",
     _tao_fields_IOP_CodecFactory_UnknownEncoding,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
   &_tao_tc_IOP_CodecFactory_UnknownEncoding;
 
@@ -186,7 +186,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/IOP/CodecFactory:1.0",
     "CodecFactory");
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_CodecFactory =
@@ -219,7 +219,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
@@ -270,7 +270,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -281,7 +281,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
@@ -345,7 +345,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -356,7 +356,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
@@ -420,7 +420,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -431,7 +431,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
@@ -495,7 +495,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -577,7 +577,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
@@ -628,7 +628,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -639,7 +639,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h
index d17987c45bf..b0e6e594507 100644
--- a/TAO/tao/CodecFactory/IOP_CodecC.h
+++ b/TAO/tao/CodecFactory/IOP_CodecC.h
@@ -48,10 +48,10 @@
 #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/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
 
@@ -201,14 +201,14 @@ namespace IOP
       ~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;
@@ -217,48 +217,48 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp: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;
@@ -267,28 +267,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp: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
@@ -297,10 +297,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode (
         const ::CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -309,10 +309,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::FormatMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode_value (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -321,10 +321,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode_value (
         const ::CORBA::OctetSeq & data,
         ::CORBA::TypeCode_ptr tc
@@ -335,102 +335,102 @@ namespace IOP
         ::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
@@ -438,65 +438,65 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-  
+
   class TAO_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;
@@ -505,28 +505,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp: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
@@ -535,36 +535,36 @@ namespace IOP
         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
@@ -581,7 +581,7 @@ namespace TAO
 
 #if !defined (_IOP_CODEC__TRAITS_CH_)
 #define _IOP_CODEC__TRAITS_CH_
-  
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec>
   {
@@ -602,7 +602,7 @@ namespace TAO
 
 #if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
 #define _IOP_CODECFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory>
   {