diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-03 17:38:46 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-03 17:38:46 +0000 |
| commit | 6ea42305dfe431fdaff8eed75b1146a293c7c07f (patch) | |
| tree | b8adf3c7f0f24648d2298f4e62ad003dc221b1c3 /TAO/tao | |
| parent | 6dc9e3a38ea16da0d1c9394869d86406ad6ead6f (diff) | |
| download | ATCD-6ea42305dfe431fdaff8eed75b1146a293c7c07f.tar.gz | |
ChangeLogTag:Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao')
350 files changed, 1637 insertions, 507 deletions
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index 7a27a68e747..d968f65b205 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -15,6 +15,7 @@ #include "ace/Dynamic_Service.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -198,4 +199,6 @@ TAO::TypeCode::Alias<StringType, Traits<StringType>::get_typecode (this->content_type_)); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ALIAS_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index e0d5dd2d06a..201f3f001fc 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -27,6 +27,7 @@ #include "tao/TypeCodeFactory_Adapter.h" #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -123,6 +124,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Alias_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl index fb692130538..0be28aa9d70 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename StringType, typename TypeCodeType, @@ -26,3 +27,5 @@ TAO::TypeCode::Alias<StringType, , content_type_ (tc) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index bad91cccc89..5ab5c5b0655 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -19,6 +19,7 @@ ACE_RCSID (tao, Alias_TypeCode_Static, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Alias<char const *, @@ -173,3 +174,5 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode::_duplicate ( Traits<char const *>::get_typecode (this->content_type_)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index 92541682efc..ce78541df83 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -27,6 +27,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -121,6 +122,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Alias_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl index a2665f5e461..1be08b55121 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -16,3 +18,5 @@ TAO::TypeCode::Alias<char const *, , content_type_ (tc) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 2509cfbe947..7ed239f9c3d 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -25,6 +25,8 @@ ACE_RCSID (tao, Any, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + using namespace TAO; CORBA::Any::Any (void) @@ -770,4 +772,4 @@ namespace TAO } } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 38e3936b444..6100e206a89 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -29,6 +29,8 @@ #include "ace/CDR_Stream.h" #include "ace/CORBA_macros.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class Any_Impl; @@ -323,10 +325,14 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WChar *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any.inl" #else +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Copying versions of insertion operators for basic types /// must also be defined for CORBA::Any_var. @@ -391,6 +397,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &, TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &, CORBA::Any::to_object); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl index 281074ede88..dd987ea89f5 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -2,6 +2,9 @@ // // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::Any_Impl * CORBA::Any::impl (void) const { @@ -366,3 +369,5 @@ CORBA::Any_out::operator-> (void) { return this->ptr_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 0e35d292055..90199306ded 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "tao/AnyTypeCode/SystemExceptionA.h" @@ -6,10 +6,12 @@ #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID (tao, +ACE_RCSID (AnyTypeCode, TAO_AnyTypeCode_Adapter, "$Id$") +TAO_END_VERSIONED_NAMESPACE_DECL + #define STANDARD_EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ TAO_SYSTEM_EXCEPTION (BAD_PARAM) \ @@ -139,6 +141,7 @@ TAO_AnyTypeCode_Adapter_Impl::Initializer (void) ); } +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( TAO_AnyTypeCode_Adapter_Impl, diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index ccee6c0a090..c2bcebaabda 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -25,6 +25,8 @@ #include "tao/AnyTypeCode_Adapter.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_AnyTypeCode_Adapter */ @@ -109,6 +111,8 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AnyTypeCode_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_AnyTypeCode_Adapter_Impl) diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h index 92ddfa65a0b..d954af4b0ad 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h @@ -30,6 +30,8 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class NamedValue; @@ -51,6 +53,8 @@ namespace CORBA TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr); } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANYTYPECODE_METHODS_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h index 26e4b66a844..085a068aa6b 100644 --- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h +++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #include "tao/Var_Size_Argument_T.h" #include "tao/Arg_Traits_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -47,6 +49,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANY_ARG_TRAITS_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 258c469dd0e..eb5bc831afc 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_ARRAY_IMPL_T_C -#define TAO_ANY_ARRAY_IMPL_T_C +#ifndef TAO_ANY_ARRAY_IMPL_T_CPP +#define TAO_ANY_ARRAY_IMPL_T_CPP #include "tao/AnyTypeCode/Any_Array_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,9 +18,7 @@ # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Any_Array_Impl_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T_slice, typename T_forany> TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T ( @@ -160,4 +158,6 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr } } -#endif /* TAO_ANY_ARRAY_IMPL_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_ANY_ARRAY_IMPL_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index 4f0d7ce0dee..f7c0d1656ab 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -62,13 +64,10 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl index 876b658d0ae..c64d59e022c 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T_slice, typename T_forany> ACE_INLINE CORBA::Boolean @@ -26,3 +28,5 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const { return this->value_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index 4f390f5be3e..a61785783fe 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -14,6 +14,8 @@ ACE_RCSID (tao, Any_Basic_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc, @@ -380,3 +382,5 @@ namespace TAO } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index 34f75baad1d..563a252d54a 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file Any_Basic_Impl.h @@ -20,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -92,6 +95,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANY_BASIC_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index d5fc92f2467..c1a53a33929 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_BASIC_IMPL_T_C -#define TAO_ANY_BASIC_IMPL_T_C +#ifndef TAO_ANY_BASIC_IMPL_T_CPP +#define TAO_ANY_BASIC_IMPL_T_CPP #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,10 +18,7 @@ # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Any_Basic_Impl_T, - "$Id$") - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc, @@ -142,4 +139,6 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -#endif /* TAO_ANY_BASIC_IMPL_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_ANY_BASIC_IMPL_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index d704f87b546..aff9109b34b 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -59,13 +61,10 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl index 4250b5f4f88..1cd0d1627dc 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T> ACE_INLINE CORBA::Boolean @@ -24,3 +28,4 @@ TAO::Any_Basic_Impl_T<T>::value (void) const return &this->value_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 0bba1c76c46..e8613b6b3e8 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -21,9 +21,7 @@ # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Any_Dual_Impl_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor, @@ -199,4 +197,6 @@ TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ANY_DUAL_IMPL_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index 8c06f69d64c..e09cdad1f77 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -74,13 +77,10 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl index bf3ecd90e33..8e97656a93a 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl @@ -1,5 +1,10 @@ +// -*- C++ -*- +// // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T> ACE_INLINE CORBA::Boolean @@ -24,3 +29,4 @@ TAO::Any_Dual_Impl_T<T>::value (void) const return this->value_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index a0192816d53..c4978873c83 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -14,6 +14,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Any_Impl::Any_Impl (_tao_destructor destructor, CORBA::TypeCode_ptr tc, bool encoded) @@ -135,3 +137,4 @@ TAO::Any_Impl::encoded (void) const return this->encoded_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 128072e25cc..7765368325d 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -1,11 +1,13 @@ // -*- C++ -*- + //============================================================================= /** * @file Any_Impl.h * * $Id$ * - * @authors Carlos O'Ryan and Jeff Parsons + * @author Carlos O'Ryan + * @author Jeff Parsons */ //============================================================================= @@ -29,10 +31,12 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" +class ACE_Message_Block; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; -class ACE_Message_Block; namespace CORBA { @@ -108,6 +112,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANY_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index f4a04cb568e..c0e8104cf70 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_IMPL_T_C -#define TAO_ANY_IMPL_T_C +#ifndef TAO_ANY_IMPL_T_CPP +#define TAO_ANY_IMPL_T_CPP #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -19,9 +19,7 @@ # include "tao/AnyTypeCode/Any_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Any_Impl_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor, @@ -154,4 +152,6 @@ TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -#endif /* TAO_ANY_IMPL_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_ANY_IMPL_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index b584831329c..8bd33423120 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_SPECIAL_IMPL_T_C -#define TAO_ANY_SPECIAL_IMPL_T_C +#ifndef TAO_ANY_SPECIAL_IMPL_T_CPP +#define TAO_ANY_SPECIAL_IMPL_T_CPP #include "tao/AnyTypeCode/Any_Special_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -15,9 +15,7 @@ # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - Any_Special_Impl_T, - "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T, typename from_T, typename to_T> TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T ( @@ -205,4 +203,6 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( } } -#endif /* TAO_ANY_T_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_ANY_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c5fe808c64e..c166c9293ca 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -64,13 +66,10 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl index bc8715b083f..cce6dbda782 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean @@ -28,3 +32,4 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const return this->value_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index d3a4b55193c..654ea1a376d 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -21,6 +21,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor, CORBA::TypeCode_ptr tc, CORBA::SystemException * const val) @@ -204,3 +206,5 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr) ACE_ENDTRY; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h index 2856c6cf3f1..a26dacfe1c1 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.h +++ b/TAO/tao/AnyTypeCode/Any_SystemException.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -79,5 +81,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_ANY_SYSTEMEXCEPTION_H*/ diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 062c906b303..bd1751f3f76 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -15,6 +15,8 @@ ACE_RCSID (tao, Any_Unknown_IDL_Type, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_Auto_Ptr<ACE_Lock> TAO::Unknown_IDL_Type::lock_(new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>()); TAO::Unknown_IDL_Type::Unknown_IDL_Type ( @@ -293,3 +295,5 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index 56d0cb2b1b4..eae32d55ae4 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -1,11 +1,13 @@ // -*- C++ -*- + //============================================================================= /** * @file Any_Unknown_IDL_Type.h * * $Id$ * - * @authors Carlos O'Ryan and Jeff Parsons + * @author Carlos O'Ryan + * @author Jeff Parsons */ //============================================================================= @@ -26,6 +28,8 @@ class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -68,6 +72,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */ diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 6f9f5589c15..2f81ff16811 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -12,6 +12,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const @@ -81,3 +83,5 @@ TAO::TypeCode::Empty_Param::get_compact_typecode_i ( return &compact_typecode; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index 4b39c0cf73a..62b9936a1a9 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -88,6 +90,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Empty_Param_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl index 85ec45fd029..bfead3de02d 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl @@ -2,9 +2,12 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k) : CORBA::TypeCode (k) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index 112f3cc463e..607c0c3fe6c 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -15,6 +15,7 @@ # include "tao/AnyTypeCode/Enum_TypeCode.inl" #endif /* !__ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> bool @@ -218,4 +219,6 @@ TAO::TypeCode::Enum<StringType, return Traits<StringType>::get_string (this->enumerators_[index]); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_ENUM_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index e85387209d6..64a4d7bf9b0 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -25,6 +25,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -122,6 +123,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Enum_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl index 8b8e04f8632..dc8d3b6631a 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class EnumeratorArrayType, @@ -19,3 +20,5 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum ( , enumerators_ (enumerators) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 930fb10eaf2..4393fc10be6 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -13,10 +13,11 @@ #endif /* !__ACE_INLINE__ */ -ACE_RCSID (tao, +ACE_RCSID (AnyTypeCode, Enum_TypeCode_Static, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Enum<char const *, @@ -212,3 +213,5 @@ TAO::TypeCode::Enum<char const *, return Traits<char const *>::get_string (this->enumerators_[index]); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index e8b78607c85..d9f22d44271 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -26,6 +26,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -127,6 +128,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Enum_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl index 1d2ab5ca8cb..b0f1e6df742 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::TypeCode::Enum<char const *, char const * const *, @@ -18,3 +20,5 @@ TAO::TypeCode::Enum<char const *, , enumerators_ (enumerators) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index d0adfdcb7b0..0fae62d507c 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -10,6 +10,7 @@ # include "tao/AnyTypeCode/Fixed_TypeCode.inl" #endif /* !__ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class RefCountPolicy> bool @@ -107,5 +108,6 @@ TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i ( return this->scale_; } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_FIXED_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 740ae58de8e..3e300cb3658 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -95,6 +97,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Fixed_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl index 9db9ca2b26d..61aad41d671 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits, @@ -12,3 +14,5 @@ TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits, , scale_ (scale) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index f3cab27779d..22219d0a0e0 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -32,6 +32,8 @@ ACE_RCSID (tao, Marshal, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Marshal_Object::~TAO_Marshal_Object (void) { } @@ -255,3 +257,4 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 94e98d86f81..6232bc5f87d 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -27,6 +27,8 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class TypeCode; @@ -447,6 +449,8 @@ private: CORBA::Boolean nested_processing_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Marshal.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl index 8b78849a003..9c632873b55 100644 --- a/TAO/tao/AnyTypeCode/Marshal.inl +++ b/TAO/tao/AnyTypeCode/Marshal.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// //$Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_Marshal_Object::TAO_Marshal_Object (void) { @@ -75,3 +79,5 @@ TAO_Marshal_Value::TAO_Marshal_Value (void) : nested_processing_ (0) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 963b3c9d2b2..1aed606a606 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -25,6 +25,8 @@ ACE_RCSID (tao, NVList, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Reference counting for DII Request object CORBA::ULong @@ -496,3 +498,4 @@ CORBA::NVList::_lazy_has_arguments (void) const } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 0b7cf469847..0b73c17576c 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -33,6 +33,8 @@ #include "ace/Atomic_Op.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_InputCDR; @@ -301,6 +303,8 @@ namespace CORBA }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/NVList.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index 035279feaf6..e89db0e4dfb 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::NamedValue_ptr nv) { @@ -124,3 +126,5 @@ CORBA::NVList::_nil (void) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 212a10a3dbf..7ed8cb3d983 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -9,6 +9,8 @@ ACE_RCSID (AnyTypeCode, #include "tao/AnyTypeCode/NVList.h" #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_NVList_Adapter_Impl::create_list ( CORBA::Long count, @@ -68,6 +70,8 @@ TAO_NVList_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl, ACE_TEXT ("TAO_NVList_Adapter"), ACE_SVC_OBJ_T, @@ -75,5 +79,3 @@ ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl) - - diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index 60593941e08..e24ebd357c5 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,8 @@ #include "tao/NVList_Adapter.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_NVList_Adapter */ @@ -44,13 +46,14 @@ public: static int Initializer (void); }; +static int TAO_Requires_NVList_Adapter_Impl_Initializer = + TAO_NVList_Adapter_Impl::Initializer (); + +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_NVList_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl) -static int -TAO_Requires_NVList_Adapter_Impl_Initializer = - TAO_NVList_Adapter_Impl::Initializer (); - #include /**/ "ace/post.h" #endif /* TAO_NVLIST_ADAPTER_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 9206227ec0d..8a39b8e9c52 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -24,6 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -73,6 +77,8 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_NULL_REFCOUNT_POLICY_H */ diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index bf53f06da69..460e9ed86cf 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -13,6 +13,7 @@ #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class RefCountPolicy> bool @@ -150,4 +151,6 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i ( return this->attributes_.name (); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_OBJREF_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 0e2a0e03f3a..8444669513a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -32,6 +32,8 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -104,6 +106,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Objref_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl index e40aa1e10d9..fa8f28d1808 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class RefCountPolicy> ACE_INLINE @@ -14,3 +15,5 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref ( , attributes_ (id, name) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 69a540da1f0..dc3605222a6 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -18,6 +18,7 @@ ACE_RCSID (tao, Objref_TypeCode_Static, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal ( @@ -147,3 +148,4 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( return this->attributes_.name (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index f12217caef9..f67bb980e66 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -108,6 +110,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Objref_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl index 07c5d36ece2..6673159051b 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( @@ -13,3 +14,5 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( , attributes_ (id, name) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp index a96abe13a0b..db48e1583f7 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp @@ -1,12 +1,13 @@ // $Id$ - #include "tao/CDR.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType> bool TAO::TypeCode::Recursive_Type<TypeCodeBase, @@ -136,3 +137,5 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, return (cdr << indirection_kind); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 08b0025560c..027100bb476 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -18,9 +18,11 @@ #include /**/ "ace/pre.h" -#include "ace/Recursive_Thread_Mutex.h" #include "tao/Basic_Types.h" #include "tao/Typecode_typesC.h" +#include "ace/Recursive_Thread_Mutex.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -198,6 +200,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl index 7f7a5ea6fe8..efd9091a125 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType> ACE_INLINE TAO::TypeCode::Recursive_Type<TypeCodeBase, @@ -147,3 +149,5 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, this->fields_ = fields; this->nfields_ = nfields; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h index fd9a09754c5..ac0be52fc3b 100644 --- a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h +++ b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h @@ -24,6 +24,9 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class Null_RefCount_Policy; @@ -101,6 +104,8 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_REFCOUNT_POLICY_TRAITS_H */ diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index a3b7c2e458c..76016fe93fe 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -11,6 +11,7 @@ # include "tao/AnyTypeCode/Sequence_TypeCode.inl" #endif /* !__ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename TypeCodeType, class RefCountPolicy> bool @@ -144,5 +145,6 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i ( Traits<TypeCodeType>::get_typecode (this->content_type_)); } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_SEQUENCE_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 555511402c0..3b8cd242ade 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -23,6 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -115,6 +118,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Sequence_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl index 81e7add5646..27de6a56926 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <typename TypeCodeType, class RefCountPolicy> ACE_INLINE TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence ( @@ -21,3 +23,5 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence ( { // ACE_ASSERT (kind == CORBA::tk_array || kind == CORBA::tk_sequence); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index d0ab50e8dde..e967f69c096 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -13,6 +13,7 @@ ACE_RCSID (tao, Sequence_TypeCode_Static, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, @@ -145,3 +146,5 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode::_duplicate ( Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 7975d403192..7c3d4746fbc 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -26,6 +26,7 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -115,6 +116,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Sequence_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl index 27e98729656..b433031f883 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::Sequence ( @@ -14,3 +16,5 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, , length_ (length) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index 8542fc7ce99..bae404af34e 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -10,6 +10,7 @@ # include "tao/AnyTypeCode/String_TypeCode.inl" #endif /* !__ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class RefCountPolicy> bool @@ -87,5 +88,6 @@ TAO::TypeCode::String<RefCountPolicy>::length_i ( return this->length_; } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_STRING_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 628e251c491..86a7270f12b 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -93,6 +95,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/String_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.inl b/TAO/tao/AnyTypeCode/String_TypeCode.inl index 90e8e887c3b..2f5fb0b6487 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind, @@ -12,3 +14,5 @@ TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind, { // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index a0817ca8c31..60783babaec 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -13,6 +13,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal ( TAO_OutputCDR & cdr, @@ -82,3 +84,5 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( { return this->length_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 9bd90692793..8911843a9ee 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -26,6 +26,7 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -97,6 +98,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/String_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl index 4d42413daa1..726d9242f8e 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String ( CORBA::TCKind kind, @@ -12,3 +14,5 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String ( { // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index 65ad7720597..aa50e7bdf78 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -17,6 +17,7 @@ #include "ace/Dynamic_Service.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -343,4 +344,6 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (this->fields_[index].type)); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_STRUCT_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index dc356f07447..df44f2d2a3a 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -27,6 +27,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -137,6 +138,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Struct_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl index eb3da52ae7e..ad95ae544fa 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -45,3 +46,5 @@ TAO::TypeCode::Struct<StringType, // CORBA::tk_except is not allowed in the recursive TypeCode case. // ACE_ASSERT (kind == CORBA::tk_struct); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 41211b42d25..8228c5de001 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -20,6 +20,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -314,3 +316,5 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode::_duplicate ( Traits<char const *>::get_typecode (this->fields_[index].type)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index b923b4c9917..dea9405238b 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -28,6 +28,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -142,6 +143,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Struct_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl index f32a858b845..d17483fe23f 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Struct<char const *, @@ -21,3 +22,5 @@ TAO::TypeCode::Struct<char const *, , fields_ (fields) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h deleted file mode 100644 index b66ae8db4d2..00000000000 --- a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h +++ /dev/null @@ -1,113 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file TC_Constants_Forward.h - * - * $Id$ - * - * Forward declare the type code constants used in the ORB. - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef TAO_TC_CONSTANTS_FORWARD_H -#define TAO_TC_CONSTANTS_FORWARD_H - -#include /**/ "ace/pre.h" - -#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" - -namespace CORBA -{ - class TypeCode; - typedef TypeCode *TypeCode_ptr; - - /** - * @name TypeCode Constants - * - * All the TypeCode constants - */ - //@{ - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_null; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_void; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_short; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_long; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ushort; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ulong; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_float; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_double; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_boolean; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_char; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_octet; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_any; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_TypeCode; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Principal; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Object; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_string; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_longlong; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ulonglong; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_longdouble; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_wchar; - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_wstring; - -#define TAO_SYSTEM_EXCEPTION_LIST \ - TAO_SYSTEM_EXCEPTION(UNKNOWN); \ - TAO_SYSTEM_EXCEPTION(BAD_PARAM); \ - TAO_SYSTEM_EXCEPTION(NO_MEMORY); \ - TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \ - TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \ - TAO_SYSTEM_EXCEPTION(INV_OBJREF); \ - TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \ - TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \ - TAO_SYSTEM_EXCEPTION(INTERNAL); \ - TAO_SYSTEM_EXCEPTION(MARSHAL); \ - TAO_SYSTEM_EXCEPTION(INITIALIZE); \ - TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \ - TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \ - TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \ - TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \ - TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \ - TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \ - TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \ - TAO_SYSTEM_EXCEPTION(TRANSIENT); \ - TAO_SYSTEM_EXCEPTION(FREE_MEM); \ - TAO_SYSTEM_EXCEPTION(INV_IDENT); \ - TAO_SYSTEM_EXCEPTION(INV_FLAG); \ - TAO_SYSTEM_EXCEPTION(INTF_REPOS); \ - TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \ - TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \ - TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \ - TAO_SYSTEM_EXCEPTION(INV_POLICY); \ - TAO_SYSTEM_EXCEPTION(REBIND); \ - TAO_SYSTEM_EXCEPTION(TIMEOUT); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \ - TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \ - TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \ - TAO_SYSTEM_EXCEPTION(BAD_QOS); \ - TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \ - TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \ - TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \ - TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); - - // = Typecode constants for system exceptions. -#define TAO_SYSTEM_EXCEPTION(name) \ - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ ## name - TAO_SYSTEM_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - //@} - - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_UnknownUserException; - - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Current; - - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_NamedValue; -} - -#include /**/ "ace/post.h" - -#endif /* TAO_TC_CONSTANTS_FORWARD_H */ diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 3b5b3fab354..79191d3b8ec 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -11,7 +11,10 @@ ACE_RCSID (tao, True_RefCount_Policy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::True_RefCount_Policy::~True_RefCount_Policy (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index 89035c00f47..6bef507fae0 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -29,6 +29,8 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -106,6 +108,7 @@ namespace TAO } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/True_RefCount_Policy.inl" diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl index 87b1b1b9159..db9631237de 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::True_RefCount_Policy::True_RefCount_Policy (void) @@ -23,3 +24,5 @@ TAO::True_RefCount_Policy::remove_ref (void) if (new_count == 0) delete this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index a84b422f4b0..b00f394c1f0 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -18,6 +18,7 @@ ACE_RCSID (tao, #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::TypeCode::~TypeCode (void) { @@ -485,3 +486,4 @@ TAO::unaliased_kind (CORBA::TypeCode_ptr tc return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index dd9a6d7b2bb..93edd808684 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -42,6 +42,8 @@ #endif #define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var; @@ -579,6 +581,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index 64cd68fe7c1..eb044d6641f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -4,6 +4,8 @@ #include "tao/Environment.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::TypeCode_ptr obj) { @@ -156,3 +158,5 @@ CORBA::TypeCode::_tao_any_destructor (void * x) CORBA::release (static_cast <CORBA::TypeCode_ptr> (x)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 4771d75d95b..03740852534 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCode @@ -77,6 +81,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Base_Attributes.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl index d94e65040a6..915e4ed9411 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl @@ -4,6 +4,7 @@ #include "tao/AnyTypeCode/TypeCode_Traits.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename STRING_TYPE> ACE_INLINE @@ -49,3 +50,5 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name) this->name_ = the_name; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index 3ad634f15a7..f9297bab75b 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -30,6 +30,7 @@ ACE_RCSID (tao, TypeCode_CDR_Extraction, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -1323,3 +1324,5 @@ operator>> (TAO_InputCDR & cdr, return tc_demarshal (cdr, tc, infos); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h index b7571fbfbf4..6856c537e7a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h @@ -26,6 +26,8 @@ template <class T> class ACE_Array_Base; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace TypeCodeFactory @@ -190,6 +192,7 @@ namespace TAO } // End namespace TypeCodeFactory } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 9ed73f48bc8..0aff8144611 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -10,6 +10,7 @@ # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType> TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void) @@ -83,4 +84,6 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_TYPECODE_CASE_CPP */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 2a646e7724a..571492be627 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -23,6 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -186,6 +187,7 @@ namespace ACE } // End namespace ACE namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index bf992fde3f3..4bd6b4f8a79 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -5,6 +5,7 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/TypeCode_Traits.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType> ACE_INLINE @@ -74,3 +75,5 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::type (CORBA::TypeCode_ptr tc) // case. this->type_ = CORBA::TypeCode::_duplicate (tc); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index 579f968fd12..b86f24bd423 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -13,6 +13,7 @@ # include "tao/AnyTypeCode/TypeCode_Case_T.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -158,5 +159,6 @@ TAO::TypeCode::Case_T<DiscriminatorType, return safe_value._retn (); } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_TYPECODE_CASE_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index 516127d0054..c0cff25b880 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -25,6 +25,7 @@ #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -127,6 +128,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Case_T.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl index b6ac33bd18e..f95b599c795 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl @@ -2,6 +2,9 @@ // // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <typename DiscriminatorType, typename StringType, typename TypeCodeType> @@ -27,3 +30,5 @@ TAO::TypeCode::Case_T<DiscriminatorType, , label_ (member_label) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.h b/TAO/tao/AnyTypeCode/TypeCode_Constants.h index 8b057ace36d..52a7b040f5e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.h @@ -21,6 +21,10 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class TypeCode; @@ -58,8 +62,65 @@ namespace CORBA extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Component; extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Home; //@} + +#define TAO_SYSTEM_EXCEPTION_LIST \ + TAO_SYSTEM_EXCEPTION(UNKNOWN); \ + TAO_SYSTEM_EXCEPTION(BAD_PARAM); \ + TAO_SYSTEM_EXCEPTION(NO_MEMORY); \ + TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \ + TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \ + TAO_SYSTEM_EXCEPTION(INV_OBJREF); \ + TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \ + TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \ + TAO_SYSTEM_EXCEPTION(INTERNAL); \ + TAO_SYSTEM_EXCEPTION(MARSHAL); \ + TAO_SYSTEM_EXCEPTION(INITIALIZE); \ + TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \ + TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \ + TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \ + TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \ + TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \ + TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \ + TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \ + TAO_SYSTEM_EXCEPTION(TRANSIENT); \ + TAO_SYSTEM_EXCEPTION(FREE_MEM); \ + TAO_SYSTEM_EXCEPTION(INV_IDENT); \ + TAO_SYSTEM_EXCEPTION(INV_FLAG); \ + TAO_SYSTEM_EXCEPTION(INTF_REPOS); \ + TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \ + TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \ + TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \ + TAO_SYSTEM_EXCEPTION(INV_POLICY); \ + TAO_SYSTEM_EXCEPTION(REBIND); \ + TAO_SYSTEM_EXCEPTION(TIMEOUT); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \ + TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \ + TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \ + TAO_SYSTEM_EXCEPTION(BAD_QOS); \ + TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \ + TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \ + TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \ + TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); + + // = Typecode constants for system exceptions. +#define TAO_SYSTEM_EXCEPTION(name) \ + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ ## name + TAO_SYSTEM_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + //@} + + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_UnknownUserException; + + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Current; + + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_NamedValue; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TYPECODE_CONSTANTS_H */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h index ad1fb0b35c2..1a3d8c9deb4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h @@ -24,6 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -83,6 +84,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Traits.h b/TAO/tao/AnyTypeCode/TypeCode_Traits.h index 921f00717e8..7c1fe02b47e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class Null_RefCount_Policy; @@ -117,6 +119,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h index 7fbfcb20501..c421189f0f5 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h @@ -23,6 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -85,6 +86,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index c88e8ec1236..c395f1eca23 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -15,6 +15,7 @@ #include "ace/Value_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -446,4 +447,6 @@ TAO::TypeCode::Union<StringType, return this->default_index_; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_UNION_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 92117ba92fd..8089aeea48f 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -25,6 +25,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -160,6 +161,8 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Union_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.inl b/TAO/tao/AnyTypeCode/Union_TypeCode.inl index 84dfb32fa0b..28ac14d3537 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <typename StringType, typename TypeCodeType, class CaseArrayType, @@ -53,3 +55,5 @@ TAO::TypeCode::Union<StringType, , cases_ () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index 714b16cfa96..98e1766dddf 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -13,11 +13,13 @@ #include "ace/Value_Ptr.h" -ACE_RCSID (tao, +ACE_RCSID (AnyTypeCode, Union_TypeCode_Static, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, @@ -406,3 +408,5 @@ TAO::TypeCode::Union<char const *, { return this->default_index_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index b0a507ca168..bf58345e03f 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -26,6 +26,7 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -159,6 +160,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Union_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl index 019a8ba2a2f..4398e2a0a62 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, @@ -23,3 +25,5 @@ TAO::TypeCode::Union<char const *, , cases_ (cases) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 4be37413b75..5ae189e275d 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -16,6 +16,7 @@ # include "tao/AnyTypeCode/Value_TypeCode.inl" #endif /* !__ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -459,5 +460,6 @@ TAO::TypeCode::Value<StringType, Traits<StringType>::get_typecode (this->concrete_base_)); } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_VALUE_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index 2578a304b53..ffc18532e6f 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -28,6 +28,7 @@ #include "tao/AnyTypeCode/ValueModifierC.h" #include "tao/AnyTypeCode/VisibilityC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -160,6 +161,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Value_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.inl b/TAO/tao/AnyTypeCode/Value_TypeCode.inl index 9a8b31f0ddb..6a63efab53e 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -55,3 +56,5 @@ TAO::TypeCode::Value<StringType, , fields_ () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 369aeae045c..517785fa514 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -18,6 +18,7 @@ ACE_RCSID (tao, Value_TypeCode_Static, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Value<char const *, @@ -420,3 +421,5 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode::_duplicate ( Traits<char const *>::get_typecode (this->concrete_base_)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index 9db721919f5..57ba318ab03 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -29,6 +29,7 @@ #include "tao/AnyTypeCode/VisibilityC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -158,6 +159,7 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Value_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl index 70c7d6cf1b1..3341e18053f 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, @@ -24,3 +26,5 @@ TAO::TypeCode::Value<char const *, , fields_ (fields) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index bb14170a683..0c2f4ff4adf 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -38,6 +38,8 @@ ACE_RCSID (tao, append, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Encode instances of arbitrary data types based only on typecode. // "data" points to the data type; if it's not a primitve data type, // the TypeCode interpreter is used to recursively encode its @@ -1319,3 +1321,5 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index 31fd7a14552..171577f3518 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -36,6 +36,8 @@ ACE_RCSID (tao, skip, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream @@ -1040,3 +1042,5 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index dc4912f8d21..9265d2dc641 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -9,6 +9,7 @@ ACE_RCSID (BiDir_GIOP, BiDirGIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Set the flag to zero to start with int TAO_BiDirGIOP_Loader::is_activated_ = 0; @@ -87,12 +88,14 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val CORBA::COMPLETED_NO)); ACE_CHECK; - // We may be adding another TAO_BiDirPolicy_Validator instance for the - // same ORB (different POA). In cases where huge numbers of bi-directional POA instances - // are created, having a validator instance per POA may introduce additional delays in - // policy validation and hence, the overal policy creation time. Since this is out of the - // critical invocation processing path, I plan to keep the design simple and not try to - // avoid an ineficiency of such small proportions. + // We may be adding another TAO_BiDirPolicy_Validator instance for + // the same ORB (different POA). In cases where huge numbers of + // bi-directional POA instances are created, having a validator + // instance per POA may introduce additional delays in policy + // validation and hence, the overal policy creation time. Since this + // is out of the critical invocation processing path, I plan to keep + // the design simple and not try to avoid an ineficiency of such + // small proportions. val.add_validator (validator); } @@ -102,6 +105,8 @@ TAO_BiDirGIOP_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader, ACE_TEXT ("BiDirGIOP_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index 643bca38dc6..40d23522b8e 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file BiDirGIOP.h @@ -25,6 +26,8 @@ #include "tao/BiDir_Adapter.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_BiDirPolicy_Validator; /** @@ -61,11 +64,14 @@ private: static int is_activated_; }; +static int +TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); + +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader) ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) -static int -TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); #define TAO_BIDIRGIOP_SAFE_INCLUDE #include "BiDirPolicyC.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp index 8dcdeb2b341..5c54b772cb8 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp @@ -3,10 +3,12 @@ #include "tao/Policy_Set.h" #include "tao/ORB_Core.h" -ACE_RCSID (TAO, +ACE_RCSID (BiDir_GIOP, BiDirPolicy_Validator, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core) { @@ -54,3 +56,5 @@ TAO_BiDirPolicy_Validator::legal_policy_impl (CORBA::PolicyType type) { return (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h index a91220671d8..2c09d0baf67 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file BiDirPolicy_Validator.h @@ -23,6 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Policy_Validator.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Policy_Set; class TAO_ORB_Core; @@ -33,7 +36,6 @@ class TAO_ORB_Core; * @brief Policy Validator for BiDir GIOP class * */ - class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator { public: @@ -48,9 +50,9 @@ public: virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type); -private: - }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_BIDIR_POLICY_VALIDATOR_H_ */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index ff26f0ca91f..e2f4f2bb696 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "BiDir_ORBInitializer.h" @@ -12,6 +10,8 @@ ACE_RCSID (BiDir_GIOP, BiDir_ORBInitializer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_BiDir_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -65,3 +65,5 @@ TAO_BiDir_ORBInitializer::register_policy_factories ( ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index 736f2b637f4..3719942c697 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -30,10 +30,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Messaging ORB initializer. -class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_BiDir_ORBInitializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: @@ -54,6 +56,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index 248691a541a..10b5d64dcf2 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -9,6 +9,8 @@ ACE_RCSID (BiDir_GIOP, BiDir_PolicyFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy_ptr TAO_BiDir_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -46,3 +48,5 @@ TAO_BiDir_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index cdce842dead..d9689c37dd2 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -27,14 +27,16 @@ // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) +# pragma warning(push) +# pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all Messaging related policies. -class TAO_BiDirGIOP_Export TAO_BiDir_PolicyFactory : - public PortableInterceptor::PolicyFactory, - public TAO_Local_RefCounted_Object +class TAO_BiDir_PolicyFactory + : public PortableInterceptor::PolicyFactory + , public TAO_Local_RefCounted_Object { public: @@ -43,11 +45,13 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); + }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) -#pragma warning(pop) +# pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index c301a8a7b53..c902c6aa47a 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -10,6 +10,8 @@ ACE_RCSID (TAO, BiDir_Policy_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_BidirectionalPolicy::TAO_BidirectionalPolicy ( const BiDirPolicy::BidirectionalPolicyValue val) : ACE_NESTED_CLASS (CORBA, Object) () @@ -31,7 +33,6 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy { } - CORBA::PolicyType TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -74,7 +75,6 @@ TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } - BiDirPolicy::BidirectionalPolicyValue TAO_BidirectionalPolicy::value ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -90,3 +90,5 @@ TAO_BidirectionalPolicy::_tao_cached_type (void) const { return TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 1555b96dc9d..96fe1b1d278 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -1,6 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ -// +// -*- C++ -*- // =================================================================== /** @@ -25,10 +23,12 @@ #include "tao/LocalObject.h" #if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) +# pragma warning(push) +# pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_BidirectionalPolicy * @@ -38,14 +38,11 @@ * clients can be made bi-directional or not. Further, this policy * also needs to be set by the server to use the connections * established by the clients to send requests. - * */ - -class TAO_BiDirGIOP_Export TAO_BidirectionalPolicy - : public virtual BiDirPolicy::BidirectionalPolicy, - public virtual TAO_Local_RefCounted_Object +class TAO_BidirectionalPolicy + : public virtual BiDirPolicy::BidirectionalPolicy + , public virtual TAO_Local_RefCounted_Object { - public: /// Constructor. @@ -60,7 +57,6 @@ public: /// = The BiDir::BidirectionalPolicy methods virtual BiDirPolicy::BidirectionalPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC (( CORBA::SystemException )); @@ -75,14 +71,18 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + private: /// The attribute BiDirPolicy::BidirectionalPolicyValue value_; + }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) -#pragma warning(pop) +# pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp index 63513ba304d..7d791837473 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp @@ -1,4 +1,4 @@ -// @(#) $Id$ +// $Id$ #include "CSD_Default_Servant_Dispatcher.h" #include "CSD_POA.h" @@ -10,6 +10,8 @@ ACE_RCSID(CSD_Framework, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void) { } @@ -54,3 +56,5 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, return poa; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h index 120630c123b..69caa2e3a9d 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,8 @@ #include "tao/PortableServer/Default_Servant_Dispatcher.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CSD_Default_Servant_Dispatcher * @@ -45,5 +47,7 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index 35cb3c50054..6304af0d3a4 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -15,6 +15,7 @@ ACE_RCSID (CSD_Framework, # include "CSD_FW_Server_Request_Wrapper.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper() { @@ -460,3 +461,4 @@ TAO::CSD::FW_Server_Request_Wrapper::create_new_output_cdr () return cdr; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h index 945a921ca99..67ec7467ec4 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #include "tao/operation_details.h" #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace CSD @@ -118,6 +120,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_FW_Server_Request_Wrapper.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl index a259de116ab..13d78a1664c 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::FW_Server_Request_Wrapper::FW_Server_Request_Wrapper @@ -40,3 +43,4 @@ TAO::CSD::FW_Server_Request_Wrapper::cancel() } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp index 9163e6995dc..14e3f377dff 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp +++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp @@ -11,6 +11,8 @@ ACE_RCSID (CSD_Framework, #include "tao/ORB_Core.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_CSD_Framework_Loader::init (void) { @@ -24,3 +26,5 @@ TAO_CSD_Framework_Loader::init (void) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h index 5a13ed5f13f..94aeae3a4fc 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h +++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h @@ -22,6 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CSD_Framework_Loader * @@ -37,5 +41,7 @@ class TAO_CSD_FW_Export TAO_CSD_Framework_Loader static int init (void); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CSD_FRAMEWORK_LOADER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp index 56a46b61c18..46a962991e1 100644 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp @@ -9,6 +9,8 @@ ACE_RCSID (CSD_Framework, #include "CSD_Object_Adapter_Factory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CSD_ORBInitializer::TAO_CSD_ORBInitializer () { } @@ -29,5 +31,6 @@ TAO_CSD_ORBInitializer::post_init ( { } +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h index 0b661e2dd7c..b3a30ed60fc 100644 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h +++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -37,10 +37,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// CSD ORB initializer. -class TAO_CSD_FW_Export TAO_CSD_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class TAO_CSD_ORBInitializer + : public virtual PortableInterceptor::ORBInitializer + , public virtual TAO_Local_RefCounted_Object { public: @@ -55,6 +57,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp index cd599fd37e2..fec899dbe21 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp @@ -8,6 +8,8 @@ ACE_RCSID (CSD_Framework, CSD_Object_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter ( const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters, TAO_ORB_Core &orb_core) @@ -40,3 +42,4 @@ TAO_CSD_Object_Adapter::do_dispatch ( ACE_CHECK; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h index 83deb3c96b6..3656968be9a 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #include "tao/PortableServer/Object_Adapter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_CSD_Object_Adapter * @@ -49,6 +51,7 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_CSD_OBJECT_ADAPTER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp index 75e57a3ff93..497bab649b3 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp @@ -14,6 +14,8 @@ ACE_RCSID (CSD_Framework, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void) { } @@ -83,6 +85,7 @@ TAO_CSD_Object_Adapter_Factory::init (int /* argc */, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_CSD_Object_Adapter_Factory, diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h index 9deab152daf..9e37ac9b20c 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #include "tao/Adapter_Factory.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CSD_FW_Export TAO_CSD_Object_Adapter_Factory : public TAO_Adapter_Factory { @@ -39,6 +40,8 @@ public: ACE_TCHAR* argv[]); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index 98ec63d864e..01a35135a6f 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "CSD_POA.h" #include "CSD_Strategy_Repository.h" #include "CSD_Strategy_Base.h" @@ -15,6 +14,8 @@ ACE_RCSID (CSD_Framework, # include "CSD_POA.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Implementation skeleton constructor TAO_CSD_POA::TAO_CSD_POA (const String &name, TAO_POA_Manager &poa_manager, @@ -129,3 +130,5 @@ void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant, this->sds_proxy_->servant_deactivated_event (servant, oid ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index 8038537b45d..8567e19caab 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #include "tao/PortableServer/Regular_POA.h" #include "CSD_Strategy_Proxy.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CSD_POA @@ -97,6 +98,8 @@ private: TAO::CSD::Strategy_Proxy* sds_proxy_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_POA.inl" diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl index 7a9aef6f63a..5e94cf5401e 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.inl +++ b/TAO/tao/CSD_Framework/CSD_POA.inl @@ -1,6 +1,8 @@ +// -*- C++ -*- +// // $Id$ - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::Strategy_Proxy& @@ -9,3 +11,4 @@ TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const return *sds_proxy_; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp index c6cb6881d51..f6bd938ad4a 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp @@ -16,6 +16,7 @@ ACE_RCSID (CSD_Framework, # include "CSD_Strategy_Base.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::Strategy_Base::~Strategy_Base() { @@ -127,3 +128,5 @@ TAO::CSD::Strategy_Base::servant_deactivated_event_i { // do nothing. } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h index 3a5e13a7caa..d31749b6268 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -30,13 +30,14 @@ #include "CSD_FrameworkC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Root_POA; namespace PortableServer { class POAManager; } - namespace TAO { namespace CSD @@ -162,6 +163,7 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "CSD_Strategy_Base.inl" diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl index 1f31a6cdcf4..6dce0cf7397 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl @@ -1,7 +1,11 @@ // -*- C++ -*- +// // $Id$ + #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::CSD::Strategy_Base::Strategy_Base() : poa_activated_(false) @@ -136,3 +140,5 @@ TAO::CSD::Strategy_Base::servant_deactivated_event this->servant_deactivated_event_i(servant, oid ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp index 063ec14f9aa..8e4915b8e92 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp @@ -13,6 +13,7 @@ ACE_RCSID (CSD_Framework, # include "CSD_Strategy_Proxy.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::CSD::Strategy_Proxy::custom_strategy @@ -45,3 +46,5 @@ TAO::CSD::Strategy_Proxy::custom_strategy return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h index 78ffea92778..342d7bd86f0 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,8 +26,10 @@ #include "CSD_Strategy_Base.h" -class TAO_ServerRequest; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_ServerRequest; namespace TAO { @@ -101,6 +103,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_Strategy_Proxy.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl index 320fd6dca8f..957852e6517 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl @@ -1,6 +1,8 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::Strategy_Proxy::Strategy_Proxy() @@ -8,7 +10,6 @@ TAO::CSD::Strategy_Proxy::Strategy_Proxy() { } - ACE_INLINE TAO::CSD::Strategy_Proxy::~Strategy_Proxy() { @@ -41,7 +42,6 @@ TAO::CSD::Strategy_Proxy::dispatch_request } } - ACE_INLINE bool TAO::CSD::Strategy_Proxy::poa_activated_event() @@ -65,7 +65,6 @@ TAO::CSD::Strategy_Proxy::poa_deactivated_event() } } - ACE_INLINE void TAO::CSD::Strategy_Proxy::servant_activated_event @@ -84,7 +83,6 @@ TAO::CSD::Strategy_Proxy::servant_activated_event } } - ACE_INLINE void TAO::CSD::Strategy_Proxy::servant_deactivated_event @@ -102,3 +100,5 @@ TAO::CSD::Strategy_Proxy::servant_deactivated_event ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp index 2a98495e301..704062cb6a7 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp @@ -8,6 +8,8 @@ ACE_RCSID (CSD_Framework, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CSD_Strategy_Repository::TAO_CSD_Strategy_Repository() { } @@ -101,6 +103,7 @@ TAO_CSD_Strategy_Repository::Strategy_Node::find(const ACE_CString &name) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h index d9b1ef773d0..c22313a020f 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CSD_Strategy_Factory @@ -67,6 +68,8 @@ private: Strategy_Node * strategy_list_head_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Strategy_Repository) ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Strategy_Repository) diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp index 9117ad0b690..999dd657ab5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp @@ -12,6 +12,8 @@ ACE_RCSID (CSD_TP, #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::CSD::TP_Cancel_Visitor::~TP_Cancel_Visitor() { } @@ -42,3 +44,5 @@ TAO::CSD::TP_Cancel_Visitor::visit_request(TP_Request* request, // specific servant, always continue visitation. return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h index 538f6899979..c998dfe947c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,11 +25,12 @@ #include "CSD_TP_Queue_Visitor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace CSD { - /** * @class TP_Cancel_Visitor * @@ -64,7 +65,6 @@ namespace TAO /// be removed from the queue as a result of the visit. Leaves the /// remove_flag alone otherwise. virtual bool visit_request(TP_Request* request, bool& remove_flag); - private: @@ -76,6 +76,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Cancel_Visitor.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl index b5d698f1f7a..e1602e2dde3 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor() @@ -26,3 +29,4 @@ TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant) ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp index b43ec670d51..bd78dc95b03 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp @@ -11,6 +11,8 @@ ACE_RCSID (CSD_ThreadPool, #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::CSD::TP_Collocated_Asynch_Request::~TP_Collocated_Asynch_Request() { } @@ -49,9 +51,10 @@ TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i() ACE_ENDTRY; } - void TAO::CSD::TP_Collocated_Asynch_Request::cancel_i() { this->do_cancel(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h index bf7b2a17b37..e17f39c8611 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,7 @@ #include "CSD_TP_Corba_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -78,6 +79,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Collocated_Asynch_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl index 94a7238bd46..d44f0bc56dd 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Collocated_Asynch_Request::TP_Collocated_Asynch_Request @@ -18,3 +21,4 @@ TAO::CSD::TP_Collocated_Asynch_Request::TP_Collocated_Asynch_Request { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp index 58e868c835a..366a376ac98 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp @@ -12,6 +12,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Collocated_Synch_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Collocated_Synch_Request::~TP_Collocated_Synch_Request() { @@ -46,10 +47,10 @@ TAO::CSD::TP_Collocated_Synch_Request::dispatch_i() this->synch_helper_.dispatched(); } - void TAO::CSD::TP_Collocated_Synch_Request::cancel_i() { this->synch_helper_.cancelled(); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h index 732158e3c02..182604610ed 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,7 @@ #include "CSD_TP_Synch_Helper.h" #include "tao/Exception.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -97,6 +98,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Collocated_Synch_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl index 4481a463c1e..a46c7de8985 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request @@ -50,3 +53,5 @@ TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL) return dispatched; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp index 657cac81be0..37004cab053 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp @@ -12,6 +12,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Collocated_Synch_With_Server_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Collocated_Synch_With_Server_Request::~TP_Collocated_Synch_With_Server_Request() { @@ -62,10 +63,10 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i() ACE_ENDTRY; } - void TAO::CSD::TP_Collocated_Synch_With_Server_Request::cancel_i() { this->synch_helper_.cancelled(); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h index 39748db1853..fd6e0549149 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #include "CSD_TP_Corba_Request.h" #include "CSD_TP_Synch_Helper.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -98,6 +99,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Collocated_Synch_With_Server_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl index 08dc5141fae..1ff0407d6fd 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Server_Request (TAO_ServerRequest& server_request, @@ -25,3 +29,4 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(ACE_ENV_SINGLE_ARG_DECL_ return this->synch_helper_.wait_while_pending(); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp index a4a40ba6091..a2fea7af822 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp @@ -10,7 +10,10 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Corba_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Corba_Request::~TP_Corba_Request() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h index d6343e20935..39f01215a13 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -27,6 +27,7 @@ #include "tao/PortableServer/Servant_Base.h" #include "ace/SString.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -91,6 +92,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Corba_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl index 2047ad845d3..18d273c34a5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Corba_Request::TP_Corba_Request @@ -17,7 +20,6 @@ TAO::CSD::TP_Corba_Request::TP_Corba_Request this->poa_ = PortableServer::POA::_duplicate(poa); } - ACE_INLINE void TAO::CSD::TP_Corba_Request::do_clone() @@ -33,10 +35,11 @@ TAO::CSD::TP_Corba_Request::do_dispatch(ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } - ACE_INLINE void TAO::CSD::TP_Corba_Request::do_cancel() { this->server_request_.cancel(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp index 4ac59c6f1fa..ef6cbc5f08b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp @@ -10,6 +10,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Custom_Asynch_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Custom_Asynch_Request::~TP_Custom_Asynch_Request() { @@ -42,9 +43,10 @@ TAO::CSD::TP_Custom_Asynch_Request::dispatch_i() ACE_ENDTRY; } - void TAO::CSD::TP_Custom_Asynch_Request::cancel_i() { this->cancel_op(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h index ee3479c2e9c..0c8727ef683 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,7 @@ #include "CSD_TP_Custom_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -67,6 +68,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Custom_Asynch_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl index 7281af45b9a..4242ce41e5d 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Custom_Asynch_Request::TP_Custom_Asynch_Request @@ -9,3 +12,4 @@ TAO::CSD::TP_Custom_Asynch_Request::TP_Custom_Asynch_Request { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp index 810858cca79..9ccb075f427 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp @@ -10,7 +10,10 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Custom_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Custom_Request::~TP_Custom_Request() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h index e4d89f40e15..14ed79db65a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,7 @@ #include "CSD_TP_Custom_Request_Operation.h" #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -69,6 +70,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Custom_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl index 6b53f3cbf78..c63696ab628 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ - +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Custom_Request::TP_Custom_Request @@ -42,3 +45,4 @@ TAO::CSD::TP_Custom_Request::cancel_op() this->op_ = 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp index 49617f39ea3..16ffe49d223 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp @@ -10,7 +10,10 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Custom_Request_Operation.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Custom_Request_Operation::~TP_Custom_Request_Operation() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h index 50673612536..42fcba277f5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,7 @@ #include "tao/PortableServer/Servant_Base.h" #include "ace/Synch.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -87,6 +88,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Custom_Request_Operation.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl index cfdcc74f1c6..6a05c5df7ee 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl @@ -1,6 +1,8 @@ // -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation @@ -45,3 +47,5 @@ TAO::CSD::TP_Custom_Request_Operation::servant() { return this->servant_.in(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp index dd9162bea02..876cfd71c6b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp @@ -10,6 +10,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Custom_Synch_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Custom_Synch_Request::~TP_Custom_Synch_Request() { @@ -30,3 +31,5 @@ TAO::CSD::TP_Custom_Synch_Request::cancel_i() this->cancel_op(); this->synch_helper_.cancelled(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h index a4c5e059e40..87c63df2318 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #include "CSD_TP_Custom_Request.h" #include "CSD_TP_Synch_Helper.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -80,6 +81,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Custom_Synch_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl index 18cb942160c..cec37afcdac 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl @@ -1,10 +1,13 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Custom_Synch_Request::TP_Custom_Synch_Request (TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state) + TP_Servant_State* servant_state) : TP_Custom_Request(op,servant_state) { } @@ -16,3 +19,5 @@ TAO::CSD::TP_Custom_Synch_Request::wait() { return this->synch_helper_.wait_while_pending(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp index c10b11aa53b..d74be701c28 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp @@ -10,6 +10,7 @@ ACE_RCSID (CSD_TP, # include "CSD_TP_Dispatchable_Visitor.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Dispatchable_Visitor::~TP_Dispatchable_Visitor() { @@ -48,3 +49,5 @@ TAO::CSD::TP_Dispatchable_Visitor::visit_request(TP_Request* request, // Return true to visit the next request in the queue (if there is one). return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h index 9f639a5e8a9..b9e3d32c4a8 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #include "CSD_TP_Queue_Visitor.h" #include "CSD_TP_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -82,6 +83,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Dispatchable_Visitor.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl index ac66587e2a7..c2c16d34e26 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Dispatchable_Visitor::TP_Dispatchable_Visitor() @@ -24,3 +27,5 @@ TAO::CSD::TP_Dispatchable_Visitor::request() TP_Request_Handle handle(this->request_.in(), false); return handle._retn(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp index 7253794cf0b..e01a6988ede 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp @@ -12,6 +12,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Queue.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::CSD::TP_Queue::put(TP_Request* request) @@ -122,3 +123,5 @@ TAO::CSD::TP_Queue::accept_visitor(TP_Queue_Visitor& visitor) cur = next; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h index 7b42cfeda59..2e31e613ceb 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -87,6 +90,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Queue.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl index 58adcec4744..9e26d265f10 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl @@ -1,6 +1,10 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::CSD::TP_Queue::TP_Queue() : head_(0), @@ -21,3 +25,5 @@ TAO::CSD::TP_Queue::is_empty() const { return (this->head_ == 0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp index 95d3c39f750..09adeff7561 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp @@ -10,7 +10,10 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Queue_Visitor.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Queue_Visitor::~TP_Queue_Visitor() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h index cece3e7ffbc..e7abb4fc16a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -65,6 +68,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Queue_Visitor.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl index 77567843234..36bd9fc5608 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl @@ -1,7 +1,12 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Queue_Visitor::TP_Queue_Visitor() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp index cf7f2642505..0796ca68b72 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp @@ -10,6 +10,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Remote_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Remote_Request::~TP_Remote_Request() { @@ -55,3 +56,5 @@ TAO::CSD::TP_Remote_Request::cancel_i() { this->do_cancel(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h index c80dec5c992..872001b8f7a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,7 @@ #include "CSD_TP_Corba_Request.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -90,6 +91,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Remote_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl index baa56a9ea08..14a37aa44a9 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Remote_Request::TP_Remote_Request @@ -18,3 +21,4 @@ TAO::CSD::TP_Remote_Request::TP_Remote_Request { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp index a01d18f19dd..68fb44886df 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp @@ -10,6 +10,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Request::~TP_Request() { @@ -22,3 +23,5 @@ TAO::CSD::TP_Request::prepare_for_queue_i() // Default implementation is to do nothing. Subclasses can provide // their own implementation if needed. } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h index 4e7c61e9b09..61e3166c599 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,7 @@ #include "tao/Intrusive_Ref_Count_Base_T.h" #include "tao/Intrusive_Ref_Count_Handle_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -124,6 +125,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl index 7181678ecde..28df573bf15 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant, @@ -90,3 +93,5 @@ TAO::CSD::TP_Request::cancel() { this->cancel_i(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp index bd7413d3fd2..d658e32cd56 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp @@ -10,7 +10,10 @@ ACE_RCSID (CSD_TP, # include "CSD_TP_Servant_State.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Servant_State::~TP_Servant_State() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h index fca7d321f1d..4b86d0313a4 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,7 @@ #include "tao/Intrusive_Ref_Count_Handle_T.h" #include "ace/Synch.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -80,6 +81,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Servant_State.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl index ba67f809131..5ef996bcb6e 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Servant_State::TP_Servant_State() @@ -22,3 +25,5 @@ TAO::CSD::TP_Servant_State::busy_flag(bool new_value) { this->busy_flag_ = new_value; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h index 667b836006c..ce5d1a44832 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Synch.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -83,6 +84,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Servant_State_Map.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl index 0d0e40f54f3..1faeb7ad536 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Servant_State_Map::TP_Servant_State_Map() @@ -64,3 +67,4 @@ TAO::CSD::TP_Servant_State_Map::remove(PortableServer::Servant servant } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp index 6968234d673..bb705279b1e 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp @@ -17,6 +17,7 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Strategy.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Strategy::~TP_Strategy() { @@ -268,3 +269,4 @@ TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant ACE_CHECK; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h index ff96daa2788..792dfde8131 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -28,6 +28,7 @@ #include "tao/Intrusive_Ref_Count_Handle_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -171,6 +172,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Strategy.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl index ac2f95e3586..ef18cdba918 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::CSD::TP_Strategy::TP_Strategy(unsigned num_threads) : num_threads_(num_threads) @@ -15,3 +19,5 @@ TAO::CSD::TP_Strategy::set_num_threads(unsigned num_threads) // Simple Mutator. Assumes that num_threads > 0. this->num_threads_ = num_threads; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp index c30698076f0..04934081678 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp @@ -12,6 +12,7 @@ ACE_RCSID (CSD_ThreadPool, TP_Strategy_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::CSD::TP_Strategy_Factory::TP_Strategy_Factory() { @@ -105,6 +106,8 @@ TAO::CSD::TP_Strategy_Factory::init (int argc, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_NAMESPACE_DEFINE(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory, TAO::CSD::TP_Strategy_Factory) diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h index e51346befbf..b0035d40cd4 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "CSD_TP_Export.h" +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" @@ -24,6 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -53,6 +55,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory) ACE_FACTORY_DECLARE(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory) diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h index 80c8aaff2ec..799a44961da 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -24,6 +24,7 @@ #include "ace/Synch.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -98,6 +99,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Synch_Helper.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl index 8a54320afb4..f4c5a1380c1 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl @@ -1,5 +1,8 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Synch_Helper::TP_Synch_Helper() @@ -48,3 +51,5 @@ TAO::CSD::TP_Synch_Helper::cancelled() this->state_ = CANCELLED; this->condition_.signal(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index 8f22fcd628f..260c8cde811 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -13,6 +13,8 @@ ACE_RCSID (CSD_ThreadPool, # include "CSD_TP_Task.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::CSD::TP_Task::~TP_Task() { } @@ -308,3 +310,4 @@ TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant this->queue_.accept_visitor(cancel_visitor); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h index 25fa02f2fda..b9fd7536a7b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -29,6 +29,8 @@ #include "ace/Synch.h" #include "ace/Containers_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace CSD @@ -149,6 +151,8 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "CSD_TP_Task.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl index 5d9744d2afb..d9c203f45ce 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl @@ -1,8 +1,11 @@ +// -*- C++ -*- +// // $Id$ namespace { enum { MAX_THREADPOOL_TASK_WORKER_THREADS = 50 }; } namespace { const ACE_thread_t default_thread_id = 0; } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::TP_Task::TP_Task() @@ -15,3 +18,5 @@ TAO::CSD::TP_Task::TP_Task() activated_threads_ ((size_t)MAX_THREADPOOL_TASK_WORKER_THREADS, default_thread_id) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp index 6797bd315e9..0e757df159d 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp @@ -6,6 +6,8 @@ #include "tao/debug.h" #include "ace/Dynamic_Service.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_CSD_ThreadPool::init (void) { @@ -17,3 +19,5 @@ TAO_CSD_ThreadPool::init (void) TAO_CSD_Framework_Loader::init(); return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_TP_Strategy_Factory); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h index c1c49ba5dcd..173234d00b1 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h +++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "CSD_TP_Export.h" +#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" @@ -24,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TP_Strategy_Factory * @@ -55,6 +58,8 @@ TAO_Requires_CSD_Threadpool = #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CSD_THREADPOOL_H */ diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index 2cf7818721e..ab295537c41 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ #include "CDR_Encaps_Codec.h" @@ -20,16 +18,18 @@ #include "ace/OS_NS_string.h" -ACE_RCSID (tao, +ACE_RCSID (CodecFactory, CDR_Encaps_Codec, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major, - CORBA::Octet minor, - TAO_ORB_Core * orb_core, - TAO_Codeset_Translator_Base * char_trans, - TAO_Codeset_Translator_Base * wchar_trans) +TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec ( + CORBA::Octet major, + CORBA::Octet minor, + TAO_ORB_Core * orb_core, + TAO_Codeset_Translator_Base * char_trans, + TAO_Codeset_Translator_Base * wchar_trans) : major_ (major), minor_ (minor), orb_core_ (orb_core), @@ -364,3 +364,5 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding ( && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER)) ACE_THROW (IOP::Codec::InvalidTypeForEncoding ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index 1ea84625b7b..34f530c9e4f 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -23,6 +23,8 @@ #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Codeset_Translator_Base; /** @@ -107,9 +109,8 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. - ACE_UNIMPLEMENTED_FUNC ( - TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &)) + TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &); + void operator= (const TAO_CDR_Encaps_Codec &); private: @@ -130,6 +131,8 @@ private: TAO_Codeset_Translator_Base * wchar_translator_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CDR_ENCAPS_CODEC_H */ diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp index 646a88b28a2..ffc42bab5f4 100644 --- a/TAO/tao/CodecFactory/CodecFactory.cpp +++ b/TAO/tao/CodecFactory/CodecFactory.cpp @@ -1,5 +1,3 @@ -/* -*- C++ -*- */ - // ================================================================= /** * @file CodecFactory.cpp @@ -7,7 +5,6 @@ * $Id$ * * @author Johnny Willemsen <jwillemsen@remedy.nl> - * */ // ================================================================= @@ -21,6 +18,8 @@ ACE_RCSID (CodecFactory, CodecFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Object_ptr TAO_CodecFactory_Loader::create_object ( CORBA::ORB_ptr orb, @@ -42,6 +41,8 @@ TAO_CodecFactory_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader, ACE_TEXT ("CodecFactory_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 82c6f95b05d..627045e8844 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -30,6 +29,8 @@ #include "tao/Object_Loader.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_CodecFactory_Export TAO_CodecFactory_Loader : public TAO_Object_Loader { @@ -45,12 +46,14 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader) -ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) - static int TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader) +ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) + #include /**/ "ace/post.h" #endif /* TAO_CODECFACTORY_H */ diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index fe2fbcdfea4..e6f8aee023d 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -14,6 +14,8 @@ ACE_RCSID (CodecFactory_impl, CodecFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core) : orb_core_ (orb_core) { @@ -146,3 +148,4 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, return codec; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index 4259be59c8d..fd9660b2d75 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Codeset_Translator_Base; /** @@ -65,9 +67,8 @@ public: private: /// Prevent copying through the copy constructor and the assignment /// operator. - ACE_UNIMPLEMENTED_FUNC ( - TAO_CodecFactory (const TAO_CodecFactory &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &)) + TAO_CodecFactory (const TAO_CodecFactory &); + void operator= (const TAO_CodecFactory &); IOP::Codec_ptr create_codec_i (CORBA::Octet major, CORBA::Octet minor, @@ -88,6 +89,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ 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 */ diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h index 0dcc7be999c..a9d2b0950fc 100644 --- a/TAO/tao/Collocated_Invocation.h +++ b/TAO/tao/Collocated_Invocation.h @@ -10,6 +10,7 @@ * @author Balachandran Natarajan <bala@dre.vanderbilt.edu> */ //============================================================================= + #ifndef TAO_COLLOCATED_INVOCATION_H #define TAO_COLLOCATED_INVOCATION_H @@ -87,7 +88,9 @@ namespace TAO ACE_ENV_ARG_DECL); private: - ACE_UNIMPLEMENTED_FUNC (Collocated_Invocation (void)) + + // Disallow default construction. + Collocated_Invocation (void); }; } diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 0fa4ed4ec4a..bb2a454f776 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -91,9 +91,9 @@ public: TAO_ConnectorSetIterator end (void); private: - // Prohibited - ACE_UNIMPLEMENTED_FUNC (TAO_Connector_Registry (const TAO_Connector_Registry&)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Connector_Registry&)) + // Disallow copying and assignment. + TAO_Connector_Registry (const TAO_Connector_Registry&); + void operator= (const TAO_Connector_Registry&); private: /// List of connectors that are currently open. diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index 63e18a2bc87..6030bc71242 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file DynAnyFactory.cpp @@ -25,6 +24,8 @@ ACE_RCSID (DynamicAny, DynAnyFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Constructor from typecode TAO_DynAnyFactory::TAO_DynAnyFactory (void) { @@ -377,3 +378,4 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc return DynamicAny::DynAny::_nil (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index e4b5e99d949..1afe1bfd236 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ //============================================================================= @@ -29,6 +30,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynAnyFactory * @@ -87,6 +90,8 @@ private: TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 76c6b18c3b5..5f3ac34890e 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "DynAny_i.h" @@ -13,6 +12,7 @@ ACE_RCSID (DynamicAny, DynAny_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynAny_i::TAO_DynAny_i (void) { @@ -556,3 +556,5 @@ TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), DynamicAny::DynAny::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index db9b893ec58..bb53397cd53 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ //============================================================================= @@ -30,6 +31,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynAny_i * @@ -119,6 +122,8 @@ private: TAO_DynAny_i &operator= (const TAO_DynAny_i &src); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index e7dc61d55c5..e40f59b7940 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "DynArray_i.h" @@ -11,6 +10,7 @@ ACE_RCSID (DynamicAny, DynArray_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynArray_i::TAO_DynArray_i (void) { @@ -659,3 +659,5 @@ TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->da_members_[index].in () ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index d8b6120e9cd..70bb46375dd 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ //============================================================================= @@ -31,6 +32,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynArray_i * @@ -159,6 +162,8 @@ private: ACE_Array_Base<DynamicAny::DynAny_var> da_members_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 9c8b7a6be49..7f6384cd0e2 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "DynCommon.h" @@ -20,6 +19,8 @@ ACE_RCSID (DynamicAny, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_DynCommon::TAO_DynCommon (void) { } @@ -1849,3 +1850,5 @@ TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc return TAO_DynAnyFactory::strip_alias (tc ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index 60a15b01d91..4096e3c4457 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynCommon * @@ -546,6 +548,8 @@ private: )); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index 7db76b721af..c11c344f9d8 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -12,6 +12,7 @@ ACE_RCSID (DynamicAny, DynEnum_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynEnum_i::TAO_DynEnum_i (void) { @@ -344,3 +345,5 @@ TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), DynamicAny::DynAny::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index 57c68a2f69f..7b0cdea8892 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ //============================================================================= @@ -31,6 +32,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynEnum_i * @@ -150,6 +153,8 @@ private: CORBA::ULong value_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 2e9d1b7c352..19471656ecd 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "DynSequence_i.h" @@ -11,6 +10,7 @@ ACE_RCSID (DynamicAny, DynSequence_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynSequence_i::TAO_DynSequence_i (void) { @@ -829,3 +829,5 @@ TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->da_members_[index].in () ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index 4c0b4f8880a..e3f52c95cce 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ //============================================================================= @@ -31,6 +32,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynSequence_i * @@ -172,6 +175,8 @@ private: ACE_Array_Base<DynamicAny::DynAny_var> da_members_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index 9da0b4d001f..e84a8140d31 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "DynStruct_i.h" @@ -12,6 +11,8 @@ ACE_RCSID (DynamicAny, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_DynStruct_i::TAO_DynStruct_i (void) { } @@ -819,3 +820,5 @@ TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->da_members_[index].in () ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index 9301e632a5e..d90d3213671 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ //============================================================================= @@ -31,6 +32,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynStruct_i * @@ -179,6 +182,8 @@ private: ACE_Array_Base<DynamicAny::DynAny_var> da_members_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 26e98dc7d0b..aeefb5c4273 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ #include "DynUnion_i.h" @@ -11,6 +10,7 @@ ACE_RCSID (DynamicAny, DynUnion_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynUnion_i::TAO_DynUnion_i (void) { @@ -1121,3 +1121,5 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any, return 0; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index 3052ca6167e..a7d800d61ee 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ //============================================================================= @@ -30,6 +31,8 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_DynUnion_i * @@ -208,6 +211,8 @@ private: CORBA::ULong member_slot_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 6601550c40d..cb52a4aa968 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -1,5 +1,3 @@ -/* -*- C++ -*- */ - //============================================================================= /** * @file DynamicAny.cpp @@ -16,6 +14,8 @@ ACE_RCSID(DynamicAny, DynamicAny, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void) { } @@ -40,6 +40,8 @@ TAO_DynamicAny_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_DynamicAny_Loader, ACE_TEXT ("DynamicAny_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 198439dc114..aa641816e4f 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ - +// -*- C++ -*- //============================================================================= /** @@ -29,6 +28,8 @@ #include "tao/Object_Loader.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader { public: @@ -46,11 +47,13 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader) -ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader) - static int TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader) +ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader) + #include /**/ "ace/post.h" #endif /* TAO_DYNAMICANY_H */ diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 2e47f392f5f..3bdd818e652 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -15,6 +15,7 @@ ACE_RCSID (DynamicInterface, # include "Context.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Context::Context (void) : refcount_ (1) @@ -199,4 +200,4 @@ CORBA::ContextList::_decr_refcnt (void) } } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index de3f12de654..94d79182490 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -1,4 +1,5 @@ // -*- C++ -*- +// // $Id$ //============================================================================= @@ -43,6 +44,8 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { typedef ULong Flags; @@ -193,6 +196,8 @@ namespace CORBA }; } // End CORBA namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Context.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl index 1542333d043..87c338e31e0 100644 --- a/TAO/tao/DynamicInterface/Context.inl +++ b/TAO/tao/DynamicInterface/Context.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void CORBA::release (CORBA::Context_ptr x) @@ -91,3 +93,5 @@ CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x) return x; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index 31205aa8b6a..9cb6e6609c9 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -17,6 +17,8 @@ ACE_RCSID (DynamicInterface, # include "DII_Arguments.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { CORBA::Boolean @@ -140,3 +142,5 @@ namespace TAO } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h index cf681244b44..e56bab475ee 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.h +++ b/TAO/tao/DynamicInterface/DII_Arguments.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class NamedValue; @@ -86,6 +88,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "DII_Arguments.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl index f2c11256c20..265bffbf7de 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.inl +++ b/TAO/tao/DynamicInterface/DII_Arguments.inl @@ -2,13 +2,16 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ACE_INLINE NamedValue_Argument::NamedValue_Argument (CORBA::NamedValue_ptr x) : x_ (x) - , byte_order_ (0) - {} + , byte_order_ (0) + { + } ACE_INLINE int NamedValue_Argument::byte_order (void) const @@ -23,5 +26,8 @@ namespace TAO bool lazy_eval) : x_ (x) , lazy_evaluation_ (lazy_eval) - {} + { + } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_CORBA_methods.h b/TAO/tao/DynamicInterface/DII_CORBA_methods.h index b45e4362296..aea9e098cbb 100644 --- a/TAO/tao/DynamicInterface/DII_CORBA_methods.h +++ b/TAO/tao/DynamicInterface/DII_CORBA_methods.h @@ -31,6 +31,7 @@ #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -60,6 +61,8 @@ namespace CORBA } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DII_CORBA_METHODS_H */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index abb404acba0..6d64acc8b43 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -27,6 +27,8 @@ ACE_RCSID (DynamicInterface, DII_Invocation, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { DII_Invocation::DII_Invocation (CORBA::Object_ptr otarget, @@ -228,3 +230,5 @@ namespace TAO ACE_ENV_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index f632beb75c0..04b63d9abb3 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -16,6 +16,7 @@ #ifndef TAO_DII_INVOCATION_H #define TAO_DII_INVOCATION_H + #include /**/ "ace/pre.h" #include "dynamicinterface_export.h" @@ -27,6 +28,8 @@ #include "tao/Synch_Invocation.h" #include "tao/Messaging/Asynch_Invocation.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_DII_Deferred_Reply_Dispatcher; namespace Dynamic @@ -80,8 +83,8 @@ namespace TAO /* * */ - class TAO_DynamicInterface_Export DII_Deferred_Invocation : - public Asynch_Remote_Invocation + class TAO_DynamicInterface_Export DII_Deferred_Invocation + : public Asynch_Remote_Invocation { public: friend class DII_Deferred_Invocation_Adapter; @@ -112,5 +115,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" -#endif /* TAO_ASYNCH_INVOCATION_H */ + +#endif /* TAO_DII_INVOCATION_H */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index 749029a23e0..18d783edaff 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -109,10 +109,10 @@ namespace TAO private: /// Dont allow default initializations - ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void)) + DII_Invocation_Adapter (void); - ACE_UNIMPLEMENTED_FUNC ( - DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &)) + DII_Invocation_Adapter (const DII_Invocation_Adapter &); + DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &); }; /** diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index f835b4eca4c..69d31fe22bb 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -13,8 +13,7 @@ ACE_RCSID(DynamicInterface, "$Id$") - - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher ( @@ -144,3 +143,5 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) (void) this->decr_refcount (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index 8c1719fbec3..10a3efdea14 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -25,6 +25,8 @@ #include "tao/orbconf.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Request; @@ -71,6 +73,8 @@ private: const CORBA::Request_ptr req_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_REPLY_DISPATCHER_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index ce379c1a689..ae158ff2f19 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -9,6 +9,8 @@ ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$") #include "tao/ORB_Core.h" #include "tao/Exception.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void) { } @@ -141,6 +143,8 @@ TAO_Dynamic_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_Adapter_Impl); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( TAO_Dynamic_Adapter_Impl, ACE_TEXT ("Concrete_Dynamic_Adapter"), diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h index d1b8ec6fc8e..08d704f84ee 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -30,14 +31,16 @@ #include "dynamicinterface_export.h" #include "ace/Service_Config.h" - /** - * @class TAO_Dynamic_Adapter_Impl - * - * Concrete subclass of TAO_Dynamic_Adapter - * in the TAO library. This class helps implement various - * functions in the CORBA namespace relating to DII/DSI - * invocations. - */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +/** + * @class TAO_Dynamic_Adapter_Impl + * + * Concrete subclass of TAO_Dynamic_Adapter + * in the TAO library. This class helps implement various + * functions in the CORBA namespace relating to DII/DSI + * invocations. + */ class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl : public TAO_Dynamic_Adapter { @@ -85,12 +88,14 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl) -ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl) - static int TAO_Requires_Request_Factory_Initializer = TAO_Dynamic_Adapter_Impl::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl) +ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl) + #include /**/ "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index e8fa30d8e3f..fa00ff9b9f3 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -16,6 +16,8 @@ ACE_RCSID (DynamicInterface, #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Boolean TAO_DynamicImplementation::_is_a (const char *logical_type_id ACE_ENV_ARG_DECL) @@ -215,3 +217,5 @@ TAO_DynamicImplementation::get_id_from_primary_interface ( poa.in () ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index 7e7ed6c0c67..9418610635c 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- +// // $Id$ // ============================================================================ @@ -30,6 +31,8 @@ #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { typedef char *RepositoryId; @@ -103,6 +106,8 @@ private: ); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_DYNAMIC_IMPLEMENTATION_H */ diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index ca87c8eceaa..47b05341e21 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -12,6 +12,7 @@ ACE_RCSID (DynamicInterface, # include "ExceptionList.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ExceptionList::ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list) @@ -104,4 +105,4 @@ CORBA::ExceptionList::_decr_refcnt (void) } } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 05a17aba67e..3171f94ee06 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -47,6 +47,8 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var; @@ -123,6 +125,8 @@ namespace CORBA }; } // End CORBA namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "ExceptionList.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl index fda8385bd58..d5fe85f4b65 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.inl +++ b/TAO/tao/DynamicInterface/ExceptionList.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void CORBA::release (CORBA::ExceptionList_ptr x) @@ -52,3 +54,5 @@ CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x) return x; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index bc6317b1e53..1c30f20f061 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -23,6 +23,8 @@ ACE_RCSID (DynamicInterface, #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Reference counting for DII Request object. CORBA::ULong @@ -353,3 +355,4 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 32cf720983b..78d6bf7c37a 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -45,6 +45,8 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class NVList; @@ -266,6 +268,8 @@ namespace CORBA }; } // End CORBA namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index 4b625ef61da..f540c8652d6 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void CORBA::release (CORBA::Request_ptr x) @@ -196,3 +198,5 @@ CORBA::Request::response_received (void) return this->response_received_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 6628d52e01d..d3c760c2c17 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -19,6 +19,8 @@ ACE_RCSID (DynamicInterface, # include "Server_Request.inl" #endif /* ! __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Reference counting for DSI ServerRequest object. CORBA::ULong @@ -238,3 +240,4 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception) this->orb_server_request_.tao_send_reply (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 2db2bed43c8..4145cc1d2cd 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -42,6 +42,8 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class ServerRequest; @@ -172,6 +174,8 @@ namespace CORBA }; } // End CORBA namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "Server_Request.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 4eca4ba2639..b8e4bf6099f 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void CORBA::release (CORBA::ServerRequest_ptr x) @@ -80,3 +82,5 @@ CORBA::ServerRequest::_tao_server_request (void) { return this->orb_server_request_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index bcc01200d6a..7c7326dd688 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -18,6 +18,7 @@ ACE_RCSID (DynamicInterface, Unknown_User_Exception, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::UnknownUserException::UnknownUserException (void) : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0", @@ -134,3 +135,5 @@ namespace CORBA CORBA::TypeCode_ptr const _tc_UnknownUserException = &TAO::TypeCode::tc_UnknownUserException; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index 1976000db16..763920d0678 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -40,6 +40,8 @@ # define TAO_EXPORT_NESTED_MACRO TAO_DynamicInterface_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { /** @@ -103,6 +105,7 @@ namespace CORBA } // End CORBA namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index add9f0af0c5..8dbfb85050a 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -15,6 +15,8 @@ ACE_RCSID (IFR_Client, IFR_Client_Adapter_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { template<> @@ -214,6 +216,8 @@ TAO_IFR_Client_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( TAO_IFR_Client_Adapter_Impl, ACE_TEXT ("Concrete_IFR_Client_Adapter"), diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index bab2b9d2cb8..6fba1212ee1 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -26,6 +26,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_IFR_Client_Adapter_Impl * @@ -79,13 +81,16 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl) -ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl) - static int TAO_Requires_IFR_Client_Initializer = TAO_IFR_Client_Adapter_Impl::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl) +ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl) + + #include /**/ "ace/post.h" #endif /* TAO_IFR_CLIENT_ADAPTER_IMPL_H */ diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp index ca0a10a1038..873b0d8426b 100644 --- a/TAO/tao/IORInterceptor/IORInfo.cpp +++ b/TAO/tao/IORInterceptor/IORInfo.cpp @@ -14,10 +14,11 @@ ACE_RCSID (IORInterceptor, # include "IORInfo.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa) : poa_ (poa), - components_established_ (0) + components_established_ (false) { } @@ -190,3 +191,5 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) CORBA::COMPLETED_NO)); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index c377ff1c994..c7e7978eb9d 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -31,10 +31,11 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_Root_POA; - /** * @class TAO_IORInfo * @@ -112,7 +113,7 @@ public: /// IORInterceptor::components_established() interception point has /// been called. /** - * This method is used so to inform the IORInfo when the + * This method is used to inform the IORInfo object when the * add_ior_component() and add_ior_component_to_profile() methods * are invalid. They are only valid in the * IORInterceptor::establish_components() interception point. @@ -137,14 +138,13 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. - ACE_UNIMPLEMENTED_FUNC ( - TAO_IORInfo (const TAO_IORInfo &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &)) + TAO_IORInfo (const TAO_IORInfo &); + void operator= (const TAO_IORInfo &); private: /// Pointer to POA - TAO_Root_POA *poa_; + TAO_Root_POA * poa_; /// True if the IORInterceptor::components_established() /// interception point was called. False otherwise. @@ -158,6 +158,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "IORInfo.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl index 3a94b482656..dfb66194baf 100644 --- a/TAO/tao/IORInterceptor/IORInfo.inl +++ b/TAO/tao/IORInterceptor/IORInfo.inl @@ -2,6 +2,9 @@ // // $Id$ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_IORInfo::invalidate (void) { @@ -11,5 +14,7 @@ TAO_IORInfo::invalidate (void) ACE_INLINE void TAO_IORInfo::components_established (void) { - this->components_established_ = 1; + this->components_established_ = true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp index 8dfe90401cf..3fd442c9c49 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp @@ -9,6 +9,8 @@ ACE_RCSID (IORInterceptor, IORInterceptor_Adapter_Factory_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void) { } @@ -21,6 +23,7 @@ TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (nia, TAO_IORInterceptor_Adapter_Impl (), CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (nia); return nia; } @@ -43,6 +46,8 @@ TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( TAO_IORInterceptor_Adapter_Factory_Impl, ACE_TEXT ("Concrete_IORInterceptor_Adapter_Factory"), diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h index f41d267a92f..26f6bcc90ca 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h @@ -25,6 +25,7 @@ #include "tao/IORInterceptor_Adapter_Factory.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IORInterceptor_Adapter; @@ -51,13 +52,15 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl) -ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl) - static int TAO_Requires_IORInterceptor_Initializer = TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl) +ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl) + #define TAO_IORINTERCEPTOR_SAFE_INCLUDE #include "tao/IORInterceptor/IORInterceptorC.h" #undef TAO_IORINTERCEPTOR_SAFE_INCLUDE diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index cc823c2c9a2..0124de24c1e 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -13,6 +13,8 @@ ACE_RCSID (IORInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void) { } @@ -235,3 +237,5 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( } } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h index 50d4a0eaa11..d9d0bfd7a3e 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h @@ -26,6 +26,8 @@ #include "tao/IORInterceptor_Adapter.h" #include "tao/PI/Interceptor_List_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { typedef Interceptor_List< ::PortableInterceptor::IORInterceptor> @@ -43,7 +45,7 @@ class TAO_Root_POA; * interfaces IORInfo and IORInterceptor. This is the derived class * that contains the actual implementations. */ -class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl +class TAO_IORInterceptor_Adapter_Impl : public TAO_IORInterceptor_Adapter { public: @@ -81,6 +83,8 @@ private: TAO::IORInterceptor_List ior_interceptor_list_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IORINTERCEPTOR_ADAPTER_IMPL_H */ diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index 5d06739f52c..23d13201fbb 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -9,6 +9,8 @@ ACE_RCSID (IORManipulation, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IORManip_Loader::TAO_IORManip_Loader (void) { } @@ -33,6 +35,8 @@ TAO_IORManip_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (TAO_IORManip_Loader, ACE_TEXT ("IORManip_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index f01484f7690..0245866c504 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- // $Id$ @@ -27,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader { public: @@ -44,12 +46,14 @@ public: static int Initializer (void); }; -ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader) -ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader) - static int TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader) +ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader) + #define TAO_IORMANIP_SAFE_INCLUDE #include "IORC.h" #undef TAO_IORMANIP_SAFE_INCLUDE diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 3bba59dba08..824bd94399f 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -13,6 +13,7 @@ ACE_RCSID (IORManipulation, IORManipulation, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void) { @@ -366,3 +367,4 @@ TAO_IOR_Manipulation_impl::get_profile_count ( return count; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index 0666e0ef6b7..198c52877da 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -19,6 +19,7 @@ #ifndef TAO_IOR_MANIPULATION_H #define TAO_IOR_MANIPULATION_H + #include /**/ "ace/pre.h" #include "tao/LocalObject.h" @@ -35,7 +36,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_IORManip_Export TAO_IOR_Manipulation_impl +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_IOR_Manipulation_impl : public TAO_IOP::TAO_IOR_Manipulation, public TAO_Local_RefCounted_Object { @@ -50,9 +53,6 @@ public: TAO_IOR_Manipulation_impl (void); // constructor - ~TAO_IOR_Manipulation_impl (void); - // destructor - virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -153,13 +153,20 @@ public: CORBA::SystemException, TAO_IOP::EmptyProfileList )); -private: + +protected: + + ~TAO_IOR_Manipulation_impl (void); + // destructor }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" + #endif /* TAO_IOR_MANIPULATION_H */ diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp index 6b5d631f90f..c4e1a4dc696 100644 --- a/TAO/tao/IORTable/IORTable.cpp +++ b/TAO/tao/IORTable/IORTable.cpp @@ -16,8 +16,13 @@ ACE_RCSID (IORTable, IORTable, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_IORTable_Initializer::init (void) { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h index 4044e6de93c..8caa28cbeeb 100644 --- a/TAO/tao/IORTable/IORTable.h +++ b/TAO/tao/IORTable/IORTable.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= @@ -23,6 +23,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IORTable_Export TAO_IORTable_Initializer { public: @@ -33,6 +37,8 @@ public: static int TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init (); +TAO_END_VERSIONED_NAMESPACE_DECL + #define TAO_IORTABLE_SAFE_INCLUDE #include "IORTableC.h" #undef TAO_IORTABLE_SAFE_INCLUDE diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 7b0d6bb538a..201a27a4e47 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -15,6 +15,8 @@ ACE_RCSID (IORTable, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void) { } @@ -102,3 +104,5 @@ TAO_IOR_Table_Impl::set_locator ( ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->locator_ = IORTable::Locator::_duplicate (locator); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index acdcebdfa11..621cf250d6a 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -32,7 +32,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_IORTable_Export TAO_IOR_Table_Impl +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_IOR_Table_Impl : public virtual IORTable::Table, public virtual TAO_Local_RefCounted_Object { @@ -106,6 +108,8 @@ private: TAO_SYNCH_MUTEX lock_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index 4fedc0b3f29..4dd96735697 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -17,6 +17,8 @@ ACE_RCSID (IORTable, Table_Adapter, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) , root_ (0) @@ -121,6 +123,8 @@ TAO_Table_Adapter_Factory::create (TAO_ORB_Core *oc) return new TAO_Table_Adapter (oc); } +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (TAO_IORTable, TAO_Table_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Table_Adapter_Factory, ACE_TEXT ("TAO_IORTable"), diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index 3e1a8b2fcd8..8eb8f4595f0 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -25,6 +25,8 @@ #include "tao/Adapter_Factory.h" #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IOR_Table_Impl; class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter @@ -77,6 +79,8 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_Table_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_IORTable, TAO_Table_Adapter_Factory) diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index b42b41e7bbe..0acaf80b986 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -15,6 +15,8 @@ ACE_RCSID (ImR_Client, ImR_Client, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace ImR_Client @@ -247,7 +249,15 @@ namespace TAO return ACE_Service_Config::process_directive (ace_svc_desc_ImR_Client_Adapter_Impl); } + } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ + namespace ImR_Client + { ACE_STATIC_SVC_DEFINE ( ImR_Client_Adapter_Impl, ACE_TEXT ("Concrete_ImR_Client_Adapter"), diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h index 7df7a8296c9..eb57df1c703 100644 --- a/TAO/tao/ImR_Client/ImR_Client.h +++ b/TAO/tao/ImR_Client/ImR_Client.h @@ -26,6 +26,8 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class ServerObject_i; namespace TAO @@ -62,15 +64,23 @@ namespace TAO ServerObject_i *server_object_; }; - ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl) - ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl) - static int TAO_Requires_ImR_Client_Initializer = TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer (); } } +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace ImR_Client + { + ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl) + ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl) + } +} + #include /**/ "ace/post.h" #endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */ diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp index 1899c8afe02..473a7368e90 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.cpp +++ b/TAO/tao/ImR_Client/ServerObject_i.cpp @@ -1,9 +1,10 @@ // $Id$ +#include "ServerObject_i.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/orbconf.h" -#include "tao/ImR_Client/ServerObject_i.h" -#include "tao/PortableServer/Root_POA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) @@ -36,3 +37,5 @@ ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return PortableServer::POA::_duplicate (this->poa_.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h index 9ec22271d12..a397952aab6 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.h +++ b/TAO/tao/ImR_Client/ServerObject_i.h @@ -1,15 +1,18 @@ +// -*- C++ -*- + //============================================================================= /** * @file ServerObject_i.h * * $Id$ * - * @author Darrell Brunsch and Irfan Pyarali + * @author Darrell Brunsch + * @author Irfan Pyarali */ // =================================================================== -#ifndef TAO_IMPLREPO_I_H -#define TAO_IMPLREPO_I_H +#ifndef TAO_SERVEROBJECT_I_H +#define TAO_SERVEROBJECT_I_H #include /**/ "ace/pre.h" @@ -22,6 +25,8 @@ #include "tao/ImR_Client/ServerObjectS.h" #include "tao/ImR_Client/imr_client_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ServerObject_i * @@ -59,6 +64,8 @@ protected: PortableServer::POA_var poa_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" -#endif /* TAO_IMPLREPO_I_H */ +#endif /* TAO_SERVEROBJECT_I_H */ diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 71f54945c5e..31576b668d6 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -983,7 +983,6 @@ nobase_include_HEADERS += \ AnyTypeCode/SystemExceptionA.h \ AnyTypeCode/TAOA.h \ AnyTypeCode/TAO_AnyTypeCode_Export.h \ - AnyTypeCode/TC_Constants_Forward.h \ AnyTypeCode/TimeBaseA.h \ AnyTypeCode/True_RefCount_Policy.h \ AnyTypeCode/True_RefCount_Policy.inl \ diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 4c190f27612..44d96d99ad5 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -15,6 +15,8 @@ #include "ace/Copy_Disabled.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () : mesg_base_ (0) , request_id_ (0) @@ -239,9 +241,9 @@ TAO_AMH_Response_Handler::_remove_ref (void) if (this->allocator_) { - TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_); + TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (this->allocator_); - allocator.release(this); + allocator.release (this); } else { @@ -259,3 +261,5 @@ namespace TAO (void) arh->_remove_ref (); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 678aa406821..82b74bc9258 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -7,7 +7,6 @@ * $Id$ * * @author Mayur Deshpande <mayur@ics.uci.edu> - * */ // ========================================================================= @@ -29,12 +28,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +class ACE_Allocator; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Transport; class TAO_Pluggable_Messaging; class TAO_Output_CDR; class TAO_ORB_Core; class TAO_ServerRequest; -class ACE_Allocator; typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR; @@ -65,7 +67,7 @@ class TAO_Messaging_Export TAO_AMH_Response_Handler // isn't consistent with the specified semantics detailed in the // CCM spec. Please remove this and place it where appropriate in // your AMH tests and examples. - : virtual public TAO_Local_RefCounted_Object + : public TAO_Local_RefCounted_Object { public: @@ -82,8 +84,8 @@ public: /** * Stores necessary information from a TAO_Server_Request onto the heap */ - virtual void init(TAO_ServerRequest &server_request, - TAO_AMH_BUFFER_ALLOCATOR* allocator); + virtual void init (TAO_ServerRequest &server_request, + TAO_AMH_BUFFER_ALLOCATOR* allocator); /// @name Mutators for refcount //@{ @@ -118,8 +120,8 @@ protected: private: // Private and undefined, standard C++ idiom to prohibit copying. - ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&)) - ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&)) + TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&); + TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&); private: /// Pointer to the original message-base @@ -213,4 +215,6 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_AMH_RESPONSE_HANDLER_H */ diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 6d84968d1f6..32e740ca52c 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -20,6 +20,8 @@ ACE_RCSID (Messaging, Asynch_Invocation, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Asynch_Remote_Invocation::Asynch_Remote_Invocation ( @@ -184,3 +186,4 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h index b058c4c43a0..6c02e475920 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.h +++ b/TAO/tao/Messaging/Asynch_Invocation.h @@ -25,9 +25,12 @@ #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" +class ACE_Time_Value; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Details; class TAO_InputCDR; -class ACE_Time_Value; class TAO_Asynch_Reply_Dispatcher_Base; namespace CORBA @@ -62,6 +65,7 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_MESSAGING_ASYNCH_INVOCATION_H*/ diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index ddbd6c62b5a..95a8db3e29e 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -19,6 +19,8 @@ ACE_RCSID (Messaging, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { Asynch_Invocation_Adapter::Asynch_Invocation_Adapter ( @@ -182,3 +184,5 @@ namespace TAO } } // End namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index f48671c9360..d3360037faf 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -29,9 +29,12 @@ #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" +class ACE_Time_Value; + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Operation_Details; class TAO_Stub; -class ACE_Time_Value; class TAO_Asynch_Reply_Dispatcher; class TAO_Asynch_Reply_Dispatcher_Base; @@ -90,15 +93,17 @@ namespace TAO ARDB_Refcount_Functor> safe_rd_; private: - /// Dont allow default initializations - ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter (void)) + /// Don't allow default initializations + Asynch_Invocation_Adapter (void); - ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &)) + Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &); + Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &); }; } // End namespace TAO +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" -#endif /*TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H*/ +#endif /* TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H */ diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index e3fab16ec13..b1400a7d347 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -12,6 +12,8 @@ ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Constructor. TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher ( const TAO_Reply_Handler_Skeleton &reply_handler_skel, @@ -276,3 +278,5 @@ TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id, request_id, max_wait_time); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 03a35ced0a3..35bdf9cb5df 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -27,8 +27,10 @@ class ACE_Allocator; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Reply dispatcher for Asynchoronous Method Invocation (AMI)s. -class TAO_Messaging_Export TAO_Asynch_Reply_Dispatcher +class TAO_Asynch_Reply_Dispatcher : public TAO_Asynch_Reply_Dispatcher_Base { public: @@ -69,5 +71,7 @@ private: TAO_Asynch_Timeout_Handler *timeout_handler_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ASYNCH_REPLY_DISPATCHER_H */ diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index b3fecff6a83..97715bf8494 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -11,6 +11,7 @@ ACE_RCSID (Messaging, Asynch_Timeout_Handler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler ( TAO_Asynch_Reply_Dispatcher_Base *rd, @@ -73,3 +74,5 @@ TAO_Asynch_Timeout_Handler::cancel () this->reactor_->cancel_timer (this); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h index be230bb6374..3cb462d70b8 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -30,6 +30,8 @@ #include "ace/Event_Handler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Asynch_Reply_Dispatcher_Base; class TAO_Transport_Mux_Strategy; @@ -38,7 +40,7 @@ class TAO_Transport_Mux_Strategy; * * @brief Handler registered with the reactor in case of AMI timeouts. */ -class TAO_Messaging_Export TAO_Asynch_Timeout_Handler +class TAO_Asynch_Timeout_Handler : public ACE_Event_Handler { public: @@ -73,6 +75,8 @@ public: ACE_Reactor *reactor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */ diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index df49288c887..ca3ab359a8d 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Messaging, #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) : ACE_NESTED_CLASS (CORBA, Object) () @@ -186,11 +188,13 @@ TAO_ConnectionTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) if (TAO_debug_level > 0) { - CORBA::ULong msecs = time_value.msec (); + CORBA::ULong const msecs = time_value.msec (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"), msecs)); } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 73f041dca16..9d84d79f2a8 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Connection_Timeout_Policy_i.h @@ -11,6 +12,7 @@ #ifndef TAO_CONNECTION_TIMEOUT_POLICY_I_H #define TAO_CONNECTION_TIMEOUT_POLICY_I_H + #include /**/ "ace/pre.h" #include "tao/orbconf.h" @@ -38,7 +40,7 @@ * This policy controls the connection timeout time while * establishing connections. This policy is proprietary to TAO. */ -class TAO_Messaging_Export TAO_ConnectionTimeoutPolicy +class TAO_ConnectionTimeoutPolicy : public TAO::ConnectionTimeoutPolicy, public TAO_Local_RefCounted_Object { @@ -89,6 +91,8 @@ private: TimeBase::TimeT relative_expiry_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ #if defined(_MSC_VER) @@ -96,4 +100,5 @@ private: #endif /* _MSC_VER */ #include /**/ "ace/post.h" -#endif /*TAO_CONNECTION_TIMEOUT_POLICY_I_H*/ + +#endif /* TAO_CONNECTION_TIMEOUT_POLICY_I_H */ diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp index a1364032108..915d0785284 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Messaging, #include "tao/Messaging/Messaging.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ExceptionHolder::ExceptionHolder ( @@ -57,4 +59,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index 2ed178f4bca..c4148f96af4 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -27,6 +27,8 @@ #include "tao/Messaging/ExceptionHolderA.h" #include "tao/Messaging/ExceptionHolderC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Dynamic { class ExceptionList; @@ -54,20 +56,26 @@ namespace TAO ::CORBA::ULong exceptions_count ); - virtual ~ExceptionHolder (); - virtual void raise_exception (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual void raise_exception_with_list ( const ::Dynamic::ExceptionList & exc_list ACE_ENV_ARG_DECL_WITH_DEFAULTS ); + protected: + + virtual ~ExceptionHolder (void); + private: - TAO::Exception_Data* data_; - CORBA::ULong count_; + + TAO::Exception_Data* const data_; + CORBA::ULong const count_; + }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index 8b245a2ac34..b695b68db5c 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -17,6 +17,9 @@ ACE_RCSID (Messaging, Messaging, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Messaging_Initializer::init (void) { @@ -85,7 +88,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0) continue; - CORBA::Exception *exception = exception_data[i].alloc (); + CORBA::Exception * const exception = exception_data[i].alloc (); if (exception == 0) ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, @@ -95,7 +98,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, // Raise the exception. #if defined (TAO_HAS_EXCEPTIONS) - ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(exception); + ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception); #endif ACE_ENV_RAISE (exception); @@ -111,3 +114,5 @@ exception_holder_raise (TAO::Exception_Data *exception_data, ACE_THROW (CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES)); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index ba4077c94cb..5dcfeeb49ee 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -14,11 +14,21 @@ #ifndef TAO_MESSAGING_H #define TAO_MESSAGING_H -#include /**/ "ace/pre.h" +#include /**/ "ace/pre.h" #include "messaging_export.h" +#define TAO_MESSAGING_SAFE_INCLUDE +#include "MessagingC.h" +#undef TAO_MESSAGING_SAFE_INCLUDE + +#include "MessagingA.h" +#include "TAO_ExtC.h" +#include "tao/TAOC.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Messaging_Export TAO_Messaging_Initializer { public: @@ -29,15 +39,6 @@ public: static int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); -#define TAO_MESSAGING_SAFE_INCLUDE -#include "MessagingC.h" -#undef TAO_MESSAGING_SAFE_INCLUDE - -#include "MessagingA.h" -#include "TAO_ExtC.h" -#include "tao/TAOC.h" - - // Typedef for the Reply Handler Skeleton. // This is handcrafted not generated by the IDL compiler. @@ -91,6 +92,7 @@ namespace TAO_Messaging_Helper ACE_ENV_ARG_DECL); } +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_H */ diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index 61cd1f282bd..6d7cf2766e1 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -8,16 +8,17 @@ #include "tao/ORB_Core.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (TAO, Messaging_Loader, "$Id$") +ACE_RCSID (Messaging, Messaging_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Messaging_Loader::TAO_Messaging_Loader (void) { } TAO_Messaging_Loader::~TAO_Messaging_Loader (void) { - } int @@ -70,6 +71,8 @@ TAO_Messaging_Loader::init (int, return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_Messaging, TAO_Messaging_Loader) diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index 08a4a7fd154..ed479d13e99 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -1,20 +1,16 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** * @file Messaging_Loader.h * * $Id$ - * - * Header file for Loading RTScheduler. - * - * - * @author Yamuna Krishnamurthy <yamuna@oomworks.com> */ //============================================================================= -#ifndef TAO_RTSCHEDULER_LOADER_H -#define TAO_RTSCHEDULER_LOADER_H +#ifndef TAO_MESSAGING_LOADER_H +#define TAO_MESSAGING_LOADER_H + #include /**/ "ace/pre.h" #include "messaging_export.h" @@ -26,6 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object { public: @@ -40,8 +40,10 @@ public: ACE_TCHAR* []); }; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Messaging, TAO_Messaging_Loader) ACE_FACTORY_DECLARE (TAO_Messaging, TAO_Messaging_Loader) #include /**/ "ace/post.h" -#endif /* TAO_RTSCHEDULER_LOADER_H */ +#endif /* TAO_MESSAGING_LOADER_H */ diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index d373535fff1..81c8d9820d2 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Messaging, Messaging_ORBInitializer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void TAO_Messaging_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -144,3 +146,5 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index f9d7398a5f1..6b7ad2e69de 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -32,9 +32,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Messaging ORB initializer. -class TAO_Messaging_Export TAO_Messaging_ORBInitializer +class TAO_Messaging_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual TAO_Local_RefCounted_Object { @@ -64,14 +65,15 @@ private: void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL); + }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ - - #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_ORB_INITIALIZER_H */ diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 00b089ed21c..936c6fb5807 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -12,6 +12,8 @@ ACE_RCSID (Messaging, #include "tao/AnyTypeCode/TAOA.h" #include "tao/AnyTypeCode/Any.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) CORBA::Policy_ptr @@ -105,3 +107,5 @@ TAO_Messaging_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h index 823a3d46908..a4e5d6e2aea 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h @@ -33,8 +33,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Policy factory for all Messaging related policies. -class TAO_Messaging_Export TAO_Messaging_PolicyFactory +class TAO_Messaging_PolicyFactory : public virtual PortableInterceptor::PolicyFactory, public virtual TAO_Local_RefCounted_Object { @@ -53,6 +55,7 @@ private: #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index f4e244a8696..176ef89ab16 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -13,6 +13,8 @@ ACE_RCSID (Messaging, Messaging_Policy_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( @@ -339,3 +341,5 @@ TAO_Sync_Scope_Policy::_tao_cached_type (void) const } #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 25ee477009e..38fd268ca99 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) /* @@ -33,7 +35,7 @@ * This policy controls the total (round-trip) timeout time for a * request. */ -class TAO_Messaging_Export TAO_RelativeRoundtripTimeoutPolicy +class TAO_RelativeRoundtripTimeoutPolicy : public Messaging::RelativeRoundtripTimeoutPolicy, public TAO_Local_RefCounted_Object { @@ -151,6 +153,8 @@ private: #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Messaging/Messaging_Policy_i.i b/TAO/tao/Messaging/Messaging_Policy_i.i index 2915eaae01e..f33ea289267 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.i +++ b/TAO/tao/Messaging/Messaging_Policy_i.i @@ -1,11 +1,17 @@ +// -*- C++ -*- +// // $Id$ #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO_Sync_Scope_Policy::get_synchronization (Messaging::SyncScope &s) const { s = this->synchronization_; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp index 5ca97d9d64b..cf0d4021c77 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp @@ -8,6 +8,8 @@ ACE_RCSID (ORT, ORT_Adapter_Factory_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ORT_Adapter * @@ -38,7 +40,12 @@ namespace TAO ace_svc_desc_ORT_Adapter_Factory_Impl ); } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO +{ ACE_STATIC_SVC_DEFINE ( ORT_Adapter_Factory_Impl, ACE_TEXT ("Concrete_ORT_Adapter_Factory"), diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h index a41c3ab9f84..b93313b0c32 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h @@ -23,6 +23,9 @@ #include "ort_export.h" #include "tao/PortableServer/ORT_Adapter_Factory.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -48,14 +51,19 @@ namespace TAO // Used to force the initialization of the code. static int Initializer (void); }; - - ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl) - ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl) } static int TAO_Requires_ORTFactory_Initializer = TAO::ORT_Adapter_Factory_Impl::Initializer (); +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl) + ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl) +} + #define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" #undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp index 050be03e0dc..b365be2a2fe 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp @@ -11,6 +11,8 @@ ACE_RCSID (ObjRefTemplate, ORT_Adapter_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + char * TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -111,3 +113,5 @@ TAO::ORT_Adapter_Impl::activate ( return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h index ad2f8ecdf17..9fee609e67e 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h @@ -31,6 +31,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -38,7 +40,7 @@ namespace TAO * * @brief Implementation of the TAO::ORT_Adapter */ - class TAO_ORT_Export ORT_Adapter_Impl + class ORT_Adapter_Impl : public ORT_Adapter { public: @@ -107,6 +109,8 @@ namespace TAO } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index 9965d1edb67..b221c065f93 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -8,6 +8,8 @@ ACE_RCSID (ORT, ObjectReferenceTemplate_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { ObjectReferenceTemplate::ObjectReferenceTemplate ( @@ -74,3 +76,5 @@ namespace TAO return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h index aca0b876cdf..595faa5ca9f 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h @@ -32,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { class POA; @@ -43,13 +45,13 @@ namespace PortableServer namespace TAO { /** - * @class TAO_ObjectReferenceTemplate + * @class ObjectReferenceTemplate * * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate * interface. This is a default implementation created to be returned * by the IORInfo when the user requests the ORT or ORF. */ - class TAO_ORT_Export ObjectReferenceTemplate + class ObjectReferenceTemplate : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate, public virtual CORBA::DefaultValueRefCountBase { @@ -111,6 +113,8 @@ namespace TAO }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index e21f7a4a000..141b5df8f44 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -106,9 +106,9 @@ private: private: - /// Prevent copying - ACE_UNIMPLEMENTED_FUNC (TAO_Object_Ref_Table (const TAO_Object_Ref_Table &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Object_Ref_Table &)) + // Disallow copying and assignment. + TAO_Object_Ref_Table (const TAO_Object_Ref_Table &); + void operator= (const TAO_Object_Ref_Table &); private: diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 1edd4812af9..6156e5eb7dc 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -22,8 +22,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "PS_ForwardC.h" -#include "ace/Atomic_Op.h" #include "tao/Abstract_Servant_Base.h" +#include "ace/Atomic_Op.h" class TAO_Operation_Table; diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 69caa507680..2da45bd1469 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -301,9 +301,9 @@ private: /// i.e. is not a GIOP 1.0 profile. void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL); - // Profiles should not be copied! - ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Profile&)) + // Profiles should not be copied or assigned! + TAO_Profile (const TAO_Profile&); + void operator= (const TAO_Profile&); //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index a2c18299ba6..a0b41aa7146 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file RT_Stub.h @@ -35,8 +37,6 @@ class TAO_PriorityBandedConnectionPolicy; class TAO_ClientProtocolPolicy; class TAO_PrivateConnectionPolicy; - - /** * @class TAO_RT_Stub * @@ -123,15 +123,10 @@ private: CORBA::Boolean are_policies_parsed_; private: - // = Disallow copy constructor and assignment operator. - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &)) - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub &operator = (const TAO_RT_Stub &)) - -#if defined (__GNUG__) - // G++ (even 2.6.3) stupidly thinks instances can't be created. - // This de-warns. - friend class everyone_needs_a_friend; -#endif /* __GNUG__ */ + // = Disallow copying and assignment. + TAO_RT_Stub (const TAO_RT_Stub &); + TAO_RT_Stub &operator = (const TAO_RT_Stub &); + }; #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index b0645d68e9f..adfb279edf9 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -50,9 +50,9 @@ protected: TAO_RT_Transport_Descriptor_Property* next_; private: - // = Disallow copy constructor and assignment operator. - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &)) - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property &operator = (const TAO_RT_Transport_Descriptor_Property &)) + // = Disallow copying and assignment. + TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &); + TAO_RT_Transport_Descriptor_Property & operator= (const TAO_RT_Transport_Descriptor_Property &); }; /** diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index cd66fb6808b..a21a91684ea 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -66,9 +66,10 @@ public: void factory (TAO_Protocol_Factory *factory, int owner = 0); private: - // Prohibited - ACE_UNIMPLEMENTED_FUNC (TAO_Protocol_Item (const TAO_Protocol_Item&)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Protocol_Item&)) + + // Disallow copying and assignment. + TAO_Protocol_Item (const TAO_Protocol_Item&); + void operator= (const TAO_Protocol_Item&); private: /// Protocol factory name. diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index c6dc6361950..a3a2ce5fc9d 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -275,8 +275,8 @@ private: private: // = Disallow copy construction and assignment. - ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &)) + TAO_Stub (const TAO_Stub &); + TAO_Stub &operator = (const TAO_Stub &); protected: /// Automatically manage the ORB_Core reference count diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index f20e646ed19..251c7a26837 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -60,8 +60,8 @@ private: /// Do not copy TSS resources //@{ - ACE_UNIMPLEMENTED_FUNC (TAO_TSS_Resources(const TAO_TSS_Resources&)) - ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_TSS_Resources&)) + TAO_TSS_Resources (const TAO_TSS_Resources&); + void operator= (const TAO_TSS_Resources&); //@} public: diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index d2afe08c1ee..354690167cd 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -915,9 +915,9 @@ private: /// partial_message_ data member. void allocate_partial_message_block (void); - /// Prohibited - ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&)) + // Disallow copying and assignment. + TAO_Transport (const TAO_Transport&); + void operator= (const TAO_Transport&); /* * Specialization hook to add concrete private methods from diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h index cb510f0ded5..4bae8c0f754 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h @@ -54,14 +54,18 @@ namespace TAO TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION); private: - /// Dont allow default initializations - ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter (void)) + // Don't allow default initializations + AbstractBase_Invocation_Adapter (void); + + // Disallow copying and assignment. + AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &); + AbstractBase_Invocation_Adapter & operator= ( + const AbstractBase_Invocation_Adapter &); - ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter & operator= ( - const AbstractBase_Invocation_Adapter &)) }; } // End namespace TAO #include /**/ "ace/post.h" -#endif /*TAO_INVOCATION_ADAPTER_H*/ + +#endif /* TAO_INVOCATION_ADAPTER_H */ diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp index e35ab4b56aa..d9aebd16279 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.cpp +++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp @@ -58,10 +58,13 @@ namespace TAO private: - ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (void)) + Nested_Upcall_Guard (void) {} - ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard ( - const Nested_Upcall_Guard&)) + /// Disallow copying and assignment. + Nested_Upcall_Guard (const Nested_Upcall_Guard&); + Nested_Upcall_Guard & operator= (const Nested_Upcall_Guard&); + + private: /// Pointer to the transport that we plan to use. TAO_Transport* t_; |