diff options
Diffstat (limited to 'TAO/tao/Codeset')
20 files changed, 94 insertions, 19 deletions
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp index aaf6c477eae..b19441d037a 100644 --- a/TAO/tao/Codeset/Codeset.cpp +++ b/TAO/tao/Codeset/Codeset.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // ================================================================= /** @@ -7,7 +7,6 @@ * $Id$ * * @author Phil Mesnier <mesnier_p@ociweb.com> - * */ // ================================================================= @@ -21,6 +20,7 @@ ACE_RCSID (Codeset, Codeset, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_Codeset_Initializer::init (void) @@ -40,7 +40,9 @@ TAO_Codeset_Initializer::init (void) return result; } - result += ACE_Service_Config::process_directive + result += ACE_Service_Config::process_directive (ace_svc_desc_TAO_Codeset_Manager_Factory,1); // force replacement return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset.h b/TAO/tao/Codeset/Codeset.h index 74f3b41881b..c13934eddd1 100644 --- a/TAO/tao/Codeset/Codeset.h +++ b/TAO/tao/Codeset/Codeset.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -23,6 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Codeset_Export TAO_Codeset_Initializer { @@ -34,6 +36,8 @@ public: static int TAO_Requires_Codeset_Initializer = TAO_Codeset_Initializer::init (); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CODESET_H */ diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index 1ac130ef943..4d6f1a39510 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -28,6 +28,8 @@ ACE_RCSID (Codeset, Codeset_Manager_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Codeset_Descriptor::TAO_Codeset_Descriptor () :ncs_ (0), max_bytes_ (1), @@ -129,3 +131,5 @@ TAO_Codeset_Descriptor::translators (void) { return this->trans_base_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h index 164db546916..cbfc3c2035b 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.h +++ b/TAO/tao/Codeset/Codeset_Descriptor.h @@ -24,6 +24,8 @@ #include "tao/Codeset_Descriptor_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Codeset_Translator_Factory; class TAO_Codeset_Export TAO_Codeset_Descriptor @@ -56,6 +58,8 @@ private: Translator_Node *trans_base_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CODESET_DESCRIPTOR_H */ diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index 46a4b8d5b7f..bb9c9f2ffae 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -17,6 +17,8 @@ ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory () { } @@ -37,6 +39,8 @@ TAO_Codeset_Manager_Factory::create () return csm; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_Codeset, TAO_Codeset_Manager_Factory) ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory, ACE_TEXT ("TAO_Codeset"), diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 103ba9b52f8..2645fe28c59 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -29,6 +29,8 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Codeset_Manager_Factory * @@ -45,6 +47,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_Codeset_Manager_Factory) diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 3eb9ad37ad0..66be86c49de 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -52,6 +52,8 @@ ACE_RCSID (Codeset, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1 CONV_FRAME::CodeSetId TAO_Codeset_Manager_i::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID; @@ -401,8 +403,7 @@ TAO_Codeset_Manager_i::open(void) } } - -/// Initialise the specific type codeset factories +// Initialise the specific type codeset factories int TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, CONV_FRAME::CodeSetComponent& cs_comp) @@ -466,7 +467,6 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, return 0; } - TAO_Codeset_Translator_Base * TAO_Codeset_Manager_i::get_char_trans (CONV_FRAME::CodeSetId tcs) { @@ -506,3 +506,4 @@ TAO_Codeset_Manager_i::get_ncs (CONV_FRAME::CodeSetId &ncsc, ncsw = this->wchar_descriptor_.ncs(); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index 9fd8b02e810..c5acc4d9280 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -28,6 +28,9 @@ #include "codeset_export.h" #include "Codeset_Descriptor.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Profile; class TAO_Transport; class TAO_Operation_Details; @@ -140,6 +143,7 @@ private: TAO_Codeset_Descriptor wchar_descriptor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp index affd4752199..b8494538472 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp @@ -24,6 +24,8 @@ ACE_RCSID (Codeset, Codeset_Translator_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory () { @@ -75,3 +77,5 @@ TAO_Codeset_Translator_Factory::assign_i ( { cdr->wchar_translator(trans); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 105afa3dc65..4e1d0672480 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -8,7 +8,7 @@ * * @author Phil Mesnier <mesnier_p@ociweb.com> */ -// ========================= +// =================================================================== #ifndef TAO_CODESET_TRANSLATOR_FACTORY_H #define TAO_CODESET_TRANSLATOR_FACTORY_H @@ -24,12 +24,14 @@ #include "tao/Codeset_Translator_Base.h" #include "codeset_export.h" -class TAO_InputCDR; -class TAO_OutputCDR; class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_InputCDR; +class TAO_OutputCDR; // **************************************************************** @@ -79,6 +81,8 @@ protected: void assign_i (TAO_OutputCDR *, ACE_WChar_Codeset_Translator* ) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + // Get the template includes last #include "tao/Codeset/Codeset_Translator_Factory_T.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp index 37d327ea80e..92afb536bb0 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ // ============================================================================ @@ -23,6 +22,8 @@ #include "tao/debug.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class NCS_TO_TCS> TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::TAO_Codeset_Translator_Factory_T () : translator_(0) @@ -86,4 +87,6 @@ TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::assign (TAO_OutputCDR *cdr) const } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_CODESET_TRANSLATOR_FACTORY_T_CPP */ diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index 07408db8717..1548fbf8b8d 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -8,7 +8,8 @@ * * @author Phil Mesnier <mesnier_p@ociweb.com> */ -// ========================= +// =================================================================== + #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_H #define TAO_CODESET_TRANSLATOR_FACTORY_T_H @@ -20,6 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Codeset_Translator_Factory_T * @@ -63,6 +67,8 @@ private: NCS_TO_TCS *translator_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index 337c95e2af2..4f14caca47d 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -31,6 +31,9 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory, 0) ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF16_BOM_Factory) + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_UTF16_BOM_Factory::TAO_UTF16_BOM_Factory () : translator_ (0) , forceBE_ (false) @@ -134,3 +137,5 @@ TAO_UTF16_BOM_Factory::create_translator () const } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h index 64bc891198b..bebd2c322cc 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.h +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h @@ -27,6 +27,8 @@ #include "UTF16_BOM_Translator.h" #include "codeset_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Codeset_Export TAO_UTF16_BOM_Factory : public TAO_Codeset_Translator_Factory { @@ -60,6 +62,8 @@ private: bool forceBE_; // force big endian wchar, warray, & wstring }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF16_BOM_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF16_BOM_Factory) diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 4103c10c8b7..357e9f8b97f 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -30,6 +30,8 @@ static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T); static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU; static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ///////////////////////////// // TAO_UTF16_BOM_Translator implementation @@ -434,3 +436,5 @@ TAO_UTF16_BOM_Translator::write_swapped_wchar_array_i (ACE_OutputCDR & cdr, } return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h index 6f8e5d6bc7c..e0f5dd7846a 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.h +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h @@ -22,11 +22,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CDR_Stream.h" #include "codeset_export.h" +#include "tao/Versioned_Namespace.h" +#include "ace/CDR_Stream.h" + // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_UTF16_BOM_Translator * @@ -91,5 +95,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* UTF16_BOM_TRANSLATOR_H */ diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 6b9d2881330..a1187e2099d 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "ace/Dynamic_Service.h" #include "UTF8_Latin1_Factory.h" @@ -12,6 +11,8 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, 0) ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF8_Latin1_Factory) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_UTF8_Latin1_Factory::TAO_UTF8_Latin1_Factory() : translator_ (0) { @@ -84,3 +85,5 @@ TAO_UTF8_Latin1_Factory::create_translator () const } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h index 81bfdf71f08..68c0e78b4c7 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h @@ -11,8 +11,10 @@ #include "UTF8_Latin1_Translator.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Codeset_Export TAO_UTF8_Latin1_Factory - : public TAO_Codeset_Translator_Factory + : public TAO_Codeset_Translator_Factory { public: TAO_UTF8_Latin1_Factory (); @@ -42,6 +44,8 @@ private: TAO_UTF8_Latin1_Translator *translator_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF8_Latin1_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF8_Latin1_Factory) diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index e12bd90507a..619e9c1b92f 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -23,6 +23,7 @@ // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////// // UTF8_Latin1_Translator implementation @@ -219,3 +220,5 @@ TAO_UTF8_Latin1_Translator::write_char_array (ACE_OutputCDR & cdr, return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h index bcf40d115a9..6fc741a1c4e 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h @@ -22,11 +22,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CDR_Stream.h" #include "codeset_export.h" +#include "tao/Versioned_Namespace.h" +#include "ace/CDR_Stream.h" // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class UTF8_Latin1_Translator * @@ -78,9 +81,9 @@ private: ACE_CDR::Boolean write_char_i (ACE_OutputCDR &, ACE_CDR::Char); -private: - }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* UTF8_LATIN1_TRANSLATOR_H */ |