diff options
Diffstat (limited to 'TAO/tao/Codeset')
20 files changed, 34 insertions, 34 deletions
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp index b19441d037a..c946ad4c3b5 100644 --- a/TAO/tao/Codeset/Codeset.cpp +++ b/TAO/tao/Codeset/Codeset.cpp @@ -10,10 +10,10 @@ */ // ================================================================= -#include "Codeset.h" -#include "Codeset_Manager_Factory.h" -#include "UTF8_Latin1_Factory.h" -#include "UTF16_BOM_Factory.h" +#include "tao/Codeset/Codeset.h" +#include "tao/Codeset/Codeset_Manager_Factory.h" +#include "tao/Codeset/UTF8_Latin1_Factory.h" +#include "tao/Codeset/UTF16_BOM_Factory.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/Codeset/Codeset.h b/TAO/tao/Codeset/Codeset.h index c13934eddd1..73dc459283d 100644 --- a/TAO/tao/Codeset/Codeset.h +++ b/TAO/tao/Codeset/Codeset.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index 4d6f1a39510..89e687db0d4 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -17,8 +17,8 @@ // // ============================================================================ -#include "Codeset_Descriptor.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Descriptor.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" #include "ace/Codeset_Registry.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h index cbfc3c2035b..a0a8b89363c 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.h +++ b/TAO/tao/Codeset/Codeset_Descriptor.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "ace/CDR_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index bb9c9f2ffae..6becf8963c0 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -11,9 +11,9 @@ */ // ================================================================= -#include "Codeset_Manager_Factory.h" +#include "tao/Codeset/Codeset_Manager_Factory.h" #include "ace/Service_Config.h" -#include "Codeset_Manager_i.h" +#include "tao/Codeset/Codeset_Manager_i.h" ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$") diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 2645fe28c59..4651728556b 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 66be86c49de..25f8d360848 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -9,10 +9,10 @@ #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "Codeset_Descriptor.h" -#include "Codeset_Manager_i.h" -#include "Codeset_Translator_Factory.h" -#include "Codeset.h" +#include "tao/Codeset/Codeset_Descriptor.h" +#include "tao/Codeset/Codeset_Manager_i.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset.h" #include "ace/Dynamic_Service.h" #include "ace/Codeset_Registry.h" diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index c5acc4d9280..f5ca8491ca3 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -25,8 +25,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Unbounded_Set.h" -#include "codeset_export.h" -#include "Codeset_Descriptor.h" +#include "tao/Codeset/codeset_export.h" +#include "tao/Codeset/Codeset_Descriptor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp index b8494538472..bd3a915c51d 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" #include "tao/CDR.h" ACE_RCSID (Codeset, diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 1440bccd9ca..518a168de63 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -22,7 +22,7 @@ #include "tao/CONV_FRAMEC.h" #include "tao/Codeset_Translator_Base.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp index 92afb536bb0..734417e9934 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp @@ -18,7 +18,7 @@ #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP #define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP -#include "Codeset_Translator_Factory_T.h" +#include "tao/Codeset/Codeset_Translator_Factory_T.h" #include "tao/debug.h" #include "tao/CDR.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index 1548fbf8b8d..ce5a902c7fe 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -74,7 +74,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Codeset_Translator_Factory_T.cpp" +#include "tao/Codeset/Codeset_Translator_Factory_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index 72fae8e36bd..1140d84a6bb 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -18,7 +18,7 @@ // ============================================================================ #include "tao/debug.h" -#include "UTF16_BOM_Factory.h" +#include "tao/Codeset/UTF16_BOM_Factory.h" #include "ace/OS_NS_strings.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h index bebd2c322cc..a72652a7458 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.h +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h @@ -22,10 +22,10 @@ #include /**/ "ace/pre.h" #include "ace/Service_Config.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" -#include "UTF16_BOM_Translator.h" -#include "codeset_export.h" +#include "tao/Codeset/UTF16_BOM_Translator.h" +#include "tao/Codeset/codeset_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 357e9f8b97f..6f54540faf2 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -12,7 +12,7 @@ // // ============================================================================ -#include "UTF16_BOM_Translator.h" +#include "tao/Codeset/UTF16_BOM_Translator.h" #include "ace/OS_Memory.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h index e0f5dd7846a..6dbe046621d 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.h +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 36acbe9ba16..2298e093c7d 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/debug.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -#include "UTF8_Latin1_Factory.h" +#include "tao/Codeset/UTF8_Latin1_Factory.h" ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, ACE_TEXT ("UTF8_Latin1_Factory"), diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h index 68c0e78b4c7..292333ad7e0 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h @@ -5,11 +5,11 @@ #define UTF8_LATIN1_FACTORY_H #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "ace/Service_Config.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" -#include "UTF8_Latin1_Translator.h" +#include "tao/Codeset/UTF8_Latin1_Translator.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 619e9c1b92f..204a1dc0bd6 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -17,7 +17,7 @@ // Phil Mesnier <mesnier_p@ociweb.com> // // ============================================================================ -#include "UTF8_Latin1_Translator.h" +#include "tao/Codeset/UTF8_Latin1_Translator.h" #include "tao/debug.h" #include "ace/OS_Memory.h" diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h index 6fc741a1c4e..791ea994d43 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" |