diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode')
226 files changed, 619 insertions, 1509 deletions
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index d968f65b205..7a27a68e747 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -15,7 +15,6 @@ #include "ace/Dynamic_Service.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -199,6 +198,4 @@ 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 201f3f001fc..e0d5dd2d06a 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -27,7 +27,6 @@ #include "tao/TypeCodeFactory_Adapter.h" #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -124,8 +123,6 @@ 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 0be28aa9d70..fb692130538 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename StringType, typename TypeCodeType, @@ -27,5 +26,3 @@ 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 46baeb1705f..bad91cccc89 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "Alias_TypeCode_Static.h" #ifndef __ACE_INLINE__ -# include "tao/AnyTypeCode/Alias_TypeCode_Static.inl" +# include "Alias_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ -#include "tao/AnyTypeCode/TypeCode_Traits.h" +#include "TypeCode_Traits.h" #include "tao/ORB_Core.h" #include "tao/CDR.h" @@ -19,7 +19,6 @@ ACE_RCSID (tao, Alias_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Alias<char const *, @@ -174,5 +173,3 @@ 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 ce78541df83..92541682efc 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -27,7 +27,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -122,8 +121,6 @@ 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 1be08b55121..a2665f5e461 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -18,5 +16,3 @@ 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 cc1338b633f..0095966e1c6 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -25,8 +25,6 @@ ACE_RCSID (tao, Any, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - using namespace TAO; CORBA::Any::Any (void) @@ -275,7 +273,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) if ((cdr >> tc.out ()) == 0) { - return false; + return 0; } ACE_TRY_NEW_ENV @@ -283,7 +281,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) TAO::Unknown_IDL_Type *impl = 0; ACE_NEW_RETURN (impl, TAO::Unknown_IDL_Type (tc.in ()), - false); + 0); any.replace (impl); impl->_tao_decode (cdr @@ -292,11 +290,11 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) } ACE_CATCH (CORBA::Exception, ex) { - return false; + return 0; } ACE_ENDTRY; - return true; + return 1; } // ======================================================================= @@ -357,7 +355,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_string s) void CORBA::Any::operator<<= (CORBA::Any::from_wstring ws) { - if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_) + if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::strlen (ws.val_) > ws.bound_) { return; } @@ -768,8 +766,8 @@ namespace TAO ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return true; + return 1; } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 6100e206a89..38e3936b444 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -29,8 +29,6 @@ #include "ace/CDR_Stream.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Any_Impl; @@ -325,14 +323,10 @@ 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. @@ -397,8 +391,6 @@ 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 dd987ea89f5..281074ede88 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::Any_Impl * CORBA::Any::impl (void) const { @@ -369,5 +366,3 @@ CORBA::Any_out::operator-> (void) { return this->ptr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl index f5e60ba8edd..fb3a570b657 100644 --- a/TAO/tao/AnyTypeCode/AnySeq.pidl +++ b/TAO/tao/AnyTypeCode/AnySeq.pidl @@ -13,8 +13,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * AnySeq.pidl * */ diff --git a/TAO/tao/AnyTypeCode/AnySeqA.cpp b/TAO/tao/AnyTypeCode/AnySeqA.cpp index f379a5330db..4b87880c61f 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/AnySeqA.h" +#include "AnySeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqA.h b/TAO/tao/AnyTypeCode/AnySeqA.h index 644c4af252f..16f1b2288f1 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.h +++ b/TAO/tao/AnyTypeCode/AnySeqA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -93,8 +91,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/AnySeqC.cpp b/TAO/tao/AnyTypeCode/AnySeqC.cpp index da850503e43..f04c69e6e47 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/AnySeqC.h" +#include "AnySeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -171,5 +169,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqC.h b/TAO/tao/AnyTypeCode/AnySeqC.h index bb18f8e402a..12b744d0be4 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.h +++ b/TAO/tao/AnyTypeCode/AnySeqC.h @@ -67,8 +67,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -166,8 +164,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 86a170d7639..0e35d292055 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,12 +6,10 @@ #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID (AnyTypeCode, +ACE_RCSID (tao, TAO_AnyTypeCode_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #define STANDARD_EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ TAO_SYSTEM_EXCEPTION (BAD_PARAM) \ @@ -92,42 +90,6 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Short va } void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::UShort value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Float value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Double value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::LongLong value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::ULongLong value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::LongDouble value) -{ - (*any) <<= value; -} - -void TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) { (*any) <<= policy; @@ -177,7 +139,6 @@ 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 389623b086c..ccee6c0a090 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -25,8 +25,6 @@ #include "tao/AnyTypeCode_Adapter.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_AnyTypeCode_Adapter */ @@ -96,18 +94,6 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, CORBA::Short value); - virtual void insert_into_any (CORBA::Any * any, CORBA::UShort value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::Float value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::Double value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::LongLong value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::ULongLong value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::LongDouble value); - virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy); virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy); @@ -123,8 +109,6 @@ 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 d954af4b0ad..92ddfa65a0b 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h @@ -30,8 +30,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class NamedValue; @@ -53,8 +51,6 @@ 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 085a068aa6b..26e4b66a844 100644 --- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h +++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -25,8 +25,6 @@ #include "tao/Var_Size_Argument_T.h" #include "tao/Arg_Traits_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -49,8 +47,6 @@ 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 ad9c1a3470e..258c469dd0e 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_CPP -#define TAO_ANY_ARRAY_IMPL_T_CPP +#ifndef TAO_ANY_ARRAY_IMPL_T_C +#define TAO_ANY_ARRAY_IMPL_T_C #include "tao/AnyTypeCode/Any_Array_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,7 +18,9 @@ # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Array_Impl_T, + "$Id$") template<typename T_slice, typename T_forany> TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T ( @@ -65,14 +67,14 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = + const CORBA::Boolean _tao_equiv = any_tc->equivalent (tc ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -84,11 +86,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_); - return true; + return 1; } TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0; @@ -97,7 +99,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, ARRAY_ANY_IMPL (destructor, any_tc, T_forany::tao_alloc ()), - false); + 0); auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety ( replacement @@ -111,7 +113,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -119,7 +121,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, _tao_elem = reinterpret_cast <T_slice*> (replacement->value_); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -158,6 +160,4 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_ARRAY_IMPL_T_CPP */ +#endif /* TAO_ANY_ARRAY_IMPL_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index f7c0d1656ab..4f0d7ce0dee 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -64,10 +62,13 @@ 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 c64d59e022c..876b658d0ae 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T_slice, typename T_forany> ACE_INLINE CORBA::Boolean @@ -28,5 +26,3 @@ 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 1da4200709a..4f390f5be3e 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -14,8 +14,6 @@ ACE_RCSID (tao, Any_Basic_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc, @@ -109,9 +107,9 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (!_tao_equiv) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -123,12 +121,12 @@ namespace TAO if (narrow_impl == 0) { - return false; + return 0; } Any_Basic_Impl::assign_value (_tao_elem, narrow_impl); - return true; + return 1; } TAO::Any_Basic_Impl *replacement = @@ -150,7 +148,7 @@ namespace TAO // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading, static_cast<CORBA::Long> (tck)); @@ -161,7 +159,7 @@ namespace TAO tck); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -172,7 +170,7 @@ namespace TAO } ACE_ENDTRY; - return false; + return 0; } CORBA::Boolean @@ -382,5 +380,3 @@ 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 563a252d54a..34f75baad1d 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file Any_Basic_Impl.h @@ -21,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -95,8 +92,6 @@ 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 d2871693f43..d5fc92f2467 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_CPP -#define TAO_ANY_BASIC_IMPL_T_CPP +#ifndef TAO_ANY_BASIC_IMPL_T_C +#define TAO_ANY_BASIC_IMPL_T_C #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,7 +18,10 @@ # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Basic_Impl_T, + "$Id$") + template<typename T> TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc, @@ -56,13 +59,13 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean _tao_equiv = any_tc->equivalent (tc + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -74,11 +77,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } TAO::Any_Basic_Impl_T<T> *replacement = @@ -94,7 +97,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -102,7 +105,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -113,7 +116,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, } ACE_ENDTRY; - return false; + return 0; } template<typename T> @@ -139,6 +142,4 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_BASIC_IMPL_T_CPP */ +#endif /* TAO_ANY_BASIC_IMPL_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index aff9109b34b..d704f87b546 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -61,10 +59,13 @@ 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 1cd0d1627dc..4250b5f4f88 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T> ACE_INLINE CORBA::Boolean @@ -28,4 +24,3 @@ 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 59aded80015..0bba1c76c46 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -21,7 +21,9 @@ # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Dual_Impl_T, + "$Id$") template<typename T> TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor, @@ -110,7 +112,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -122,11 +124,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } T *empty_value = 0; @@ -150,7 +152,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -158,7 +160,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -197,6 +199,4 @@ 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 e09cdad1f77..8c06f69d64c 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,9 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -77,10 +74,13 @@ 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 8e97656a93a..bf3ecd90e33 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl @@ -1,10 +1,5 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T> ACE_INLINE CORBA::Boolean @@ -29,4 +24,3 @@ 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 d51a2539146..a0192816d53 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/AnyTypeCode/Any_Impl.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Marshal.h" +#include "Any_Impl.h" +#include "TypeCode.h" +#include "Marshal.h" #include "tao/CORBA_String.h" #include "tao/SystemException.h" @@ -14,8 +14,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Any_Impl::Any_Impl (_tao_destructor destructor, CORBA::TypeCode_ptr tc, bool encoded) @@ -137,4 +135,3 @@ 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 9eaf83b482d..128072e25cc 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -1,13 +1,11 @@ // -*- C++ -*- - //============================================================================= /** * @file Any_Impl.h * * $Id$ * - * @author Carlos O'Ryan - * @author Jeff Parsons + * @authors Carlos O'Ryan and Jeff Parsons */ //============================================================================= @@ -31,14 +29,10 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Message_Block; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; +class ACE_Message_Block; namespace CORBA { @@ -114,8 +108,6 @@ 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 d4afd38e237..f4a04cb568e 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_CPP -#define TAO_ANY_IMPL_T_CPP +#ifndef TAO_ANY_IMPL_T_C +#define TAO_ANY_IMPL_T_C #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -19,7 +19,9 @@ # include "tao/AnyTypeCode/Any_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Impl_T, + "$Id$") template<typename T> TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor, @@ -69,7 +71,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -81,11 +83,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = (T *) narrow_impl->value_; - return true; + return 1; } TAO::Any_Impl_T<T> *replacement = 0; @@ -93,7 +95,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, TAO::Any_Impl_T<T> (destructor, any_tc, 0), - false); + 0); auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); @@ -105,7 +107,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -113,7 +115,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = const_cast<T *> (replacement->value_); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -152,6 +154,4 @@ TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_IMPL_T_CPP */ +#endif /* TAO_ANY_IMPL_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index bddd912ecc9..d79c5ce2135 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -72,8 +70,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Impl_T.inl" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Impl_T.inl index 3b5b36ab5ed..1bbeebeea78 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +// This may look like C, but it's really -*- C++ -*- // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // These three are overridden in generated code where appropriate. template<typename T> @@ -54,4 +51,3 @@ TAO::Any_Impl_T<T>::value (void) const return this->value_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index 544e89127d3..b584831329c 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_CPP -#define TAO_ANY_SPECIAL_IMPL_T_CPP +#ifndef TAO_ANY_SPECIAL_IMPL_T_C +#define TAO_ANY_SPECIAL_IMPL_T_C #include "tao/AnyTypeCode/Any_Special_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -15,7 +15,9 @@ # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Special_Impl_T, + "$Id$") template<typename T, typename from_T, typename to_T> TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T ( @@ -103,7 +105,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (any_kind != try_kind) { - return false; + return 0; } CORBA::ULong length = @@ -112,7 +114,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (length != bound) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -127,11 +129,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = (T *) narrow_impl->value_; - return true; + return 1; } TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0; @@ -140,7 +142,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, tc, 0, bound), - false); + 0); auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety ( replacement @@ -154,7 +156,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -162,7 +164,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -197,18 +199,10 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( ACE_ENV_ARG_DECL ) { - if (this->value_destructor_ != 0) - { - (*this->value_destructor_) (this->value_); - this->value_ = 0; - } - if (! this->demarshal_value (cdr)) { ACE_THROW (CORBA::MARSHAL ()); } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_T_CPP */ +#endif /* TAO_ANY_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c166c9293ca..c5fe808c64e 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -66,10 +64,13 @@ 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 cce6dbda782..bc8715b083f 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean @@ -32,4 +28,3 @@ 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 2a22d8f256c..d3a4b55193c 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "tao/AnyTypeCode/Any_SystemException.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" -#include "tao/AnyTypeCode/Marshal.h" -#include "tao/AnyTypeCode/TypeCode.h" +#include "Any_SystemException.h" +#include "Any.h" +#include "Any_Unknown_IDL_Type.h" +#include "Marshal.h" +#include "TypeCode.h" #include "tao/CDR.h" #include "tao/Exception.h" @@ -21,8 +21,6 @@ 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) @@ -92,13 +90,13 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean _tao_equiv = any_tc->equivalent (tc + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -110,11 +108,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } CORBA::SystemException *empty_value = (*f) (); @@ -124,7 +122,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, TAO::Any_SystemException (destructor, any_tc, empty_value), - false); + 0); auto_ptr<TAO::Any_SystemException > replacement_safety (replacement); @@ -136,7 +134,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -144,7 +142,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } } ACE_CATCHANY @@ -181,13 +179,13 @@ TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr) this->value_->_tao_encode (cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } CORBA::Boolean @@ -198,13 +196,11 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr) this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h index a26dacfe1c1..2856c6cf3f1 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.h +++ b/TAO/tao/AnyTypeCode/Any_SystemException.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -81,7 +79,5 @@ 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 980b311f802..062c906b303 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -15,8 +15,6 @@ 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 ( @@ -67,16 +65,16 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) if (status != TAO::TRAVERSE_CONTINUE) { - return false; + return 0; } } ACE_CATCH (CORBA::Exception, ex) { - return false; + return 0; } ACE_ENDTRY; - return true; + return 1; } const void * @@ -295,5 +293,3 @@ 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 8a59bee86b0..56d0cb2b1b4 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -1,13 +1,11 @@ // -*- C++ -*- - //============================================================================= /** * @file Any_Unknown_IDL_Type.h * * $Id$ * - * @author Carlos O'Ryan - * @author Jeff Parsons + * @authors Carlos O'Ryan and Jeff Parsons */ //============================================================================= @@ -25,12 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -74,8 +68,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */ diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp index 99a63b8332a..051cf1ea18d 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/BooleanSeqA.h" +#include "BooleanSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.h b/TAO/tao/AnyTypeCode/BooleanSeqA.h index 9797a2afa66..e621d14fd31 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.h +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.h @@ -37,8 +37,6 @@ #include "tao/BooleanSeqC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::BooleanSeq*); / TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::BooleanSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::BooleanSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/Bounds.pidl b/TAO/tao/AnyTypeCode/Bounds.pidl index 707ab2b8158..c639e285fe5 100644 --- a/TAO/tao/AnyTypeCode/Bounds.pidl +++ b/TAO/tao/AnyTypeCode/Bounds.pidl @@ -15,8 +15,6 @@ * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Bounds.pidl * * and then: diff --git a/TAO/tao/AnyTypeCode/BoundsA.cpp b/TAO/tao/AnyTypeCode/BoundsA.cpp index 40891d21c2e..097395f4667 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.cpp +++ b/TAO/tao/AnyTypeCode/BoundsA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/BoundsA.h" +#include "BoundsA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -147,5 +145,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BoundsA.h b/TAO/tao/AnyTypeCode/BoundsA.h index ed91bde89f4..c3f5f3658a2 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.h +++ b/TAO/tao/AnyTypeCode/BoundsA.h @@ -62,8 +62,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -147,8 +145,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/BoundsC.cpp b/TAO/tao/AnyTypeCode/BoundsC.cpp index a4e520aa372..fec4453680a 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.cpp +++ b/TAO/tao/AnyTypeCode/BoundsC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/BoundsA.h" +#include "BoundsA.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -173,5 +171,3 @@ CORBA::Boolean operator>> ( { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BoundsC.h b/TAO/tao/AnyTypeCode/BoundsC.h index 68a4721e7dc..b228461b7b0 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.h +++ b/TAO/tao/AnyTypeCode/BoundsC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -133,8 +131,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp index 91fc0a664e3..e93d7b8e7f7 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/CONV_FRAMEA.h" +#include "CONV_FRAMEA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -427,5 +425,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h index beffd197c43..cbc76dd89aa 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CONV_FRAME { @@ -108,8 +106,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContex TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/CharSeqA.cpp b/TAO/tao/AnyTypeCode/CharSeqA.cpp index eb3fd68c0e9..e6867cf7452 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/CharSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/CharSeqA.h" +#include "CharSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CharSeqA.h b/TAO/tao/AnyTypeCode/CharSeqA.h index 76758080b9e..59c6bfdb1f4 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.h +++ b/TAO/tao/AnyTypeCode/CharSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::CharSeq*); // n TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::CharSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::CharSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/CurrentA.cpp b/TAO/tao/AnyTypeCode/CurrentA.cpp index 0501cc64e20..d7946836b98 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.cpp +++ b/TAO/tao/AnyTypeCode/CurrentA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/CurrentA.h" +#include "CurrentA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_CORBA_Current ( @@ -53,4 +51,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CurrentA.h b/TAO/tao/AnyTypeCode/CurrentA.h index 5a505a5776d..e045f6a2882 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.h +++ b/TAO/tao/AnyTypeCode/CurrentA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -56,8 +54,6 @@ namespace CORBA } // module CORBA -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/DomainA.cpp b/TAO/tao/AnyTypeCode/DomainA.cpp index 6f6db000bc2..4bf71aa1cae 100644 --- a/TAO/tao/AnyTypeCode/DomainA.cpp +++ b/TAO/tao/AnyTypeCode/DomainA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/DomainA.h" +#include "DomainA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -296,5 +294,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DomainA.h b/TAO/tao/AnyTypeCode/DomainA.h index 72c5b0f95ac..9f8660d3545 100644 --- a/TAO/tao/AnyTypeCode/DomainA.h +++ b/TAO/tao/AnyTypeCode/DomainA.h @@ -58,8 +58,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -119,8 +117,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp index a67a84fb0b5..79331b8f617 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/DoubleSeqA.h" +#include "DoubleSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.h b/TAO/tao/AnyTypeCode/DoubleSeqA.h index c905c31a980..f6bb35ddd49 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::DoubleSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::DoubleSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::DoubleSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl index 6a15c71045e..9cc2be7c43d 100644 --- a/TAO/tao/AnyTypeCode/Dynamic.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Dynamic.pidl * */ @@ -25,8 +23,8 @@ // File: Dynamic.idl // Used primarily for Interceptors -#include "tao/AnyTypeCode/Dynamic_Parameter.pidl" -#include "tao/StringSeq.pidl" +#include "Dynamic_Parameter.pidl" +#include "StringSeq.pidl" #ifndef _DYNAMIC_IDL_ #define _DYNAMIC_IDL_ diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp index 4f17ea24008..589213436f5 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.cpp +++ b/TAO/tao/AnyTypeCode/DynamicA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/DynamicA.h" +#include "DynamicA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/Dynamic_ParameterA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD #define _TAO_TYPECODE_Dynamic_ParameterList_GUARD namespace TAO @@ -287,5 +285,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicA.h b/TAO/tao/AnyTypeCode/DynamicA.h index a327a5a461a..944d9d28d76 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.h +++ b/TAO/tao/AnyTypeCode/DynamicA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { } // module CORBA @@ -129,8 +127,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCod // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp index bb693ede9b8..3b045863a7a 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.cpp +++ b/TAO/tao/AnyTypeCode/DynamicC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/DynamicC.h" +#include "DynamicC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -303,5 +301,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h index 0bdd3a59057..76b095d02f0 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.h +++ b/TAO/tao/AnyTypeCode/DynamicC.h @@ -70,8 +70,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -253,8 +251,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl index 038b00daf99..f82dd8ba366 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Dynamic_Parameter.pidl * */ @@ -29,7 +27,7 @@ #ifndef _DYNAMIC_PARAMETER_IDL_ #define _DYNAMIC_PARAMETER_IDL_ -#include "tao/ParameterMode.pidl" +#include <ParameterMode.pidl> module Dynamic { diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp index 6376ab32799..df1f94abd24 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/Dynamic_ParameterA.h" +#include "Dynamic_ParameterA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/ParameterModeA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -124,5 +122,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h index facb3803731..25b861466fd 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Dynamic { @@ -91,8 +89,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dyn // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp index 093e3c79f27..b681433ed5e 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/Dynamic_ParameterC.h" +#include "Dynamic_ParameterC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -82,5 +80,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.argument) && (strm >> _tao_aggregate.mode); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h index e5533c2b7dc..1647bfc6b91 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Dynamic { @@ -123,8 +121,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Param // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 1294bdd0fe6..6f9f5589c15 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/AnyTypeCode/Empty_Param_TypeCode.h" +#include "Empty_Param_TypeCode.h" #ifndef __ACE_INLINE__ -# include "tao/AnyTypeCode/Empty_Param_TypeCode.inl" +# include "Empty_Param_TypeCode.inl" #endif /* !__ACE_INLINE__ */ @@ -12,8 +12,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const @@ -46,7 +44,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr // Equality has already been established in the // CORBA::TypeCode base class. - return true; + return 1; } CORBA::Boolean @@ -62,12 +60,12 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc CORBA::TCKind const tc_kind = TAO::unaliased_kind (tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_kind != this->kind_) - return false; + return 0; - return true; + return 1; } CORBA::TypeCode_ptr @@ -83,5 +81,3 @@ 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 62b9936a1a9..4b39c0cf73a 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -23,8 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -90,8 +88,6 @@ 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 bfead3de02d..85ec45fd029 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl @@ -2,12 +2,9 @@ // // $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 b84a50f9b72..112f3cc463e 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -15,7 +15,6 @@ # include "tao/AnyTypeCode/Enum_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> bool @@ -90,10 +89,10 @@ TAO::TypeCode::Enum<StringType, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nenumerators_; ++i) { @@ -103,13 +102,13 @@ TAO::TypeCode::Enum<StringType, Traits<StringType>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; } - return true; + return 1; } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> @@ -125,12 +124,12 @@ TAO::TypeCode::Enum<StringType, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; - return true; + return 1; } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> @@ -219,6 +218,4 @@ 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 64a4d7bf9b0..e85387209d6 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -123,7 +122,6 @@ 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 dc8d3b6631a..8b8e04f8632 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class EnumeratorArrayType, @@ -20,5 +19,3 @@ 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 64cd8f00d37..930fb10eaf2 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -13,11 +13,10 @@ #endif /* !__ACE_INLINE__ */ -ACE_RCSID (AnyTypeCode, +ACE_RCSID (tao, Enum_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Enum<char const *, @@ -87,10 +86,10 @@ TAO::TypeCode::Enum<char const *, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nenumerators_; ++i) { @@ -100,13 +99,13 @@ TAO::TypeCode::Enum<char const *, Traits<char const *>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; } - return true; + return 1; } CORBA::Boolean @@ -121,12 +120,12 @@ TAO::TypeCode::Enum<char const *, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; - return true; + return 1; } CORBA::TypeCode_ptr @@ -213,5 +212,3 @@ 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 d9f22d44271..e8b78607c85 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -128,7 +127,6 @@ 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 b0f1e6df742..1d2ab5ca8cb 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Enum<char const *, char const * const *, @@ -20,5 +18,3 @@ TAO::TypeCode::Enum<char const *, , enumerators_ (enumerators) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index 138d2bc2b6d..ba97c942cdb 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/AnyTypeCode/ExceptionA.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +#include "ExceptionA.h" +#include "Any_Dual_Impl_T.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/ORB_Constants.h" @@ -20,8 +20,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Specializations for CORBA::Exception Any operators. namespace TAO { @@ -44,14 +42,14 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } template<> @@ -64,14 +62,14 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } // This should never get called since we don't have extraction operators @@ -87,7 +85,7 @@ namespace TAO const CORBA::Exception *& ) { - return false; + return 0; } } @@ -118,5 +116,3 @@ operator<<= (CORBA::Any &any, CORBA::Exception *exception) ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 44f6cd6834c..05d608f4403 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Exception.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -46,8 +44,6 @@ namespace CORBA TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/"ace/post.h" #endif /* TAO_EXCEPTIONA_H */ diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index 0fae62d507c..d0adfdcb7b0 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -10,7 +10,6 @@ # include "tao/AnyTypeCode/Fixed_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class RefCountPolicy> bool @@ -108,6 +107,5 @@ 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 3e300cb3658..740ae58de8e 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -23,8 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -97,8 +95,6 @@ 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 61aad41d671..9db9ca2b26d 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits, @@ -14,5 +12,3 @@ TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits, , scale_ (scale) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.cpp b/TAO/tao/AnyTypeCode/FloatSeqA.cpp index 4f33cff12e0..2d7b5761009 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.cpp +++ b/TAO/tao/AnyTypeCode/FloatSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/FloatSeqA.h" +#include "FloatSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.h b/TAO/tao/AnyTypeCode/FloatSeqA.h index e43fd256d73..149932f1466 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.h +++ b/TAO/tao/AnyTypeCode/FloatSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::FloatSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::FloatSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::FloatSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/GIOPA.cpp b/TAO/tao/AnyTypeCode/GIOPA.cpp index 6e5788601b7..2e6898c7486 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.cpp +++ b/TAO/tao/AnyTypeCode/GIOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/GIOPA.h" +#include "GIOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -328,5 +326,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/GIOPA.h b/TAO/tao/AnyTypeCode/GIOPA.h index 7971878edcc..b6b51cc4f1b 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.h +++ b/TAO/tao/AnyTypeCode/GIOPA.h @@ -39,7 +39,6 @@ #include "tao/AnyTypeCode/IOP_IORA.h" #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -96,8 +95,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/IIOPA.cpp b/TAO/tao/AnyTypeCode/IIOPA.cpp index 0af44ddaac6..89720b384a9 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.cpp +++ b/TAO/tao/AnyTypeCode/IIOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IIOPA.h" +#include "IIOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,9 +37,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -322,5 +319,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IIOPA.h b/TAO/tao/AnyTypeCode/IIOPA.h index 52931766bc1..58fc4b53f3a 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.h +++ b/TAO/tao/AnyTypeCode/IIOPA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace IIOP { @@ -90,8 +88,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceCon TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp index ce4520e630a..d528ac270c4 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IIOP_EndpointsA.h" +#include "IIOP_EndpointsA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -233,5 +231,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h index e7f1f677145..b62fc8976f1 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -108,8 +106,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/IOPA.cpp b/TAO/tao/AnyTypeCode/IOPA.cpp index a6f7e67bc7c..77398cd1a3b 100644 --- a/TAO/tao/AnyTypeCode/IOPA.cpp +++ b/TAO/tao/AnyTypeCode/IOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IOPA.h" +#include "IOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.cpp b/TAO/tao/AnyTypeCode/IOP_IORA.cpp index 0538c9143dc..0c9e8f27150 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.cpp +++ b/TAO/tao/AnyTypeCode/IOP_IORA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IOP_IORA.h" +#include "IOP_IORA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -997,5 +995,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.h b/TAO/tao/AnyTypeCode/IOP_IORA.h index aecc75df280..081015c697f 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.h +++ b/TAO/tao/AnyTypeCode/IOP_IORA.h @@ -39,8 +39,6 @@ #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -184,8 +182,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*) TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp index 61f889f87c9..98e266b808a 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/LongDoubleSeqA.h" +#include "LongDoubleSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h index 7c4b3675985..1462f4a097c 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -94,8 +92,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp index 1546a6a5106..237cc42e778 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/LongLongSeqA.h" +#include "LongLongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.h b/TAO/tao/AnyTypeCode/LongLongSeqA.h index 12256367f76..ba99c7410b9 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -94,8 +92,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/LongSeqA.cpp b/TAO/tao/AnyTypeCode/LongSeqA.cpp index fdf7bc45be2..ac83fdac8db 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/LongSeqA.h" +#include "LongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongSeqA.h b/TAO/tao/AnyTypeCode/LongSeqA.h index 0d639f5719c..29beb356664 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -95,8 +93,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 22219d0a0e0..f3cab27779d 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -32,8 +32,6 @@ ACE_RCSID (tao, Marshal, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Marshal_Object::~TAO_Marshal_Object (void) { } @@ -257,4 +255,3 @@ 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 6232bc5f87d..94e98d86f81 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,8 +27,6 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -449,8 +447,6 @@ 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 9c632873b55..8b78849a003 100644 --- a/TAO/tao/AnyTypeCode/Marshal.inl +++ b/TAO/tao/AnyTypeCode/Marshal.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Marshal_Object::TAO_Marshal_Object (void) { @@ -79,5 +75,3 @@ TAO_Marshal_Value::TAO_Marshal_Value (void) : nested_processing_ (0) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp index 345f3034f92..6d77541a020 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/Messaging_PolicyValueA.h" +#include "Messaging_PolicyValueA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -41,8 +41,6 @@ #include "tao/AnyTypeCode/Policy_ForwardA.h" #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -240,5 +238,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h index ea8e563befd..f6d5e0d7474 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { // TAO_IDL - Generated from @@ -110,8 +108,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Mes // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index b07e186305c..dcc9e9ec042 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -3,11 +3,11 @@ // Implementation of Named Value List and NamedValue classes -#include "tao/AnyTypeCode/NVList.h" -#include "tao/AnyTypeCode/BoundsC.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Marshal.h" -#include "tao/AnyTypeCode/Any_Impl.h" +#include "NVList.h" +#include "BoundsC.h" +#include "TypeCode.h" +#include "Marshal.h" +#include "Any_Impl.h" #include "tao/SystemException.h" #include "tao/CORBA_String.h" @@ -18,15 +18,13 @@ #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -# include "tao/AnyTypeCode/NVList.inl" +# include "NVList.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, NVList, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Reference counting for DII Request object CORBA::ULong @@ -82,7 +80,7 @@ CORBA::NVList::~NVList (void) for (iter.first (); !iter.done (); iter.advance ()) { - CORBA::NamedValue_ptr *nv = 0; + CORBA::NamedValue_ptr *nv; (void) iter.next (nv); delete *nv; } @@ -362,7 +360,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (arg))); + ACE_TEXT_TO_TCHAR_IN (arg))); } CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode (); (void) TAO_Marshal_Object::perform_append (tc, @@ -415,7 +413,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, for (i.first (); !i.done (); i.advance ()) { - CORBA::NamedValue_ptr *item = 0; + CORBA::NamedValue_ptr *item; (void) i.next (item); CORBA::NamedValue_ptr nv = *item; @@ -433,7 +431,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" ))); + ACE_TEXT_TO_TCHAR_IN (nv->name ()? nv->name () : "(no name given)" ))); } CORBA::Any_ptr any = nv->value (); @@ -498,4 +496,3 @@ 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 0b73c17576c..0b7cf469847 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -33,8 +33,6 @@ #include "ace/Atomic_Op.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_InputCDR; @@ -303,8 +301,6 @@ 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 e89db0e4dfb..035279feaf6 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::NamedValue_ptr nv) { @@ -126,5 +124,3 @@ 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 7ed8cb3d983..212a10a3dbf 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -9,8 +9,6 @@ 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, @@ -70,8 +68,6 @@ 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, @@ -79,3 +75,5 @@ 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 e24ebd357c5..60593941e08 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,8 +24,6 @@ #include "tao/NVList_Adapter.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_NVList_Adapter */ @@ -46,14 +44,13 @@ 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 8a39b8e9c52..9206227ec0d 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -24,10 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -77,8 +73,6 @@ 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/ObjectIdListA.cpp b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp index 5e1c5439010..409a8b0e341 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp @@ -25,15 +25,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ObjectIdListA.h" +#include "ObjectIdListA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -100,5 +98,3 @@ namespace CORBA &_tao_tc_CORBA_ORB_ObjectIdList; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.h b/TAO/tao/AnyTypeCode/ObjectIdListA.h index 50fc249bcf3..1fedb3c212a 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.h +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -89,8 +87,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index c897143e4dc..bf53f06da69 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -10,11 +10,9 @@ #endif /* !__ACE_INLINE__ */ #include "tao/CDR.h" -#include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class RefCountPolicy> bool @@ -152,6 +150,4 @@ 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 8444669513a..0e2a0e03f3a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -32,8 +32,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -106,7 +104,6 @@ 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 fa8f28d1808..e40aa1e10d9 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class RefCountPolicy> ACE_INLINE @@ -15,5 +14,3 @@ 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 dc3605222a6..69a540da1f0 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -18,7 +18,6 @@ ACE_RCSID (tao, Objref_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal ( @@ -148,4 +147,3 @@ 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 f67bb980e66..f12217caef9 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -110,7 +108,6 @@ 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 6673159051b..07c5d36ece2 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( @@ -14,5 +13,3 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( , attributes_ (id, name) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp index dd6b7864968..66b18534bb1 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.cpp +++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/OctetSeqA.h" +#include "OctetSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h index 8b94976cb20..159132d2448 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.h +++ b/TAO/tao/AnyTypeCode/OctetSeqA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp index fe43b76ce42..6d4394780cf 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/PI_ForwardA.h" +#include "PI_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -197,4 +195,3 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h index f99092e4ec1..70124737301 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.h +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h @@ -65,8 +65,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -178,8 +176,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.cpp b/TAO/tao/AnyTypeCode/ParameterModeA.cpp index b4a65bb1787..7eeaa86618c 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.cpp +++ b/TAO/tao/AnyTypeCode/ParameterModeA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ParameterModeA.h" +#include "ParameterModeA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -91,5 +89,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.h b/TAO/tao/AnyTypeCode/ParameterModeA.h index 91bb04bd510..85dbb46597e 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.h +++ b/TAO/tao/AnyTypeCode/ParameterModeA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -92,8 +90,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Pa // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 9d49724bc2f..0594672bf8f 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/PolicyA.h" +#include "PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -39,8 +39,6 @@ #include "tao/AnyTypeCode/UShortSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -557,5 +555,3 @@ operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h index ed2c78d1e3a..feae0030ce9 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.h +++ b/TAO/tao/AnyTypeCode/PolicyA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -142,8 +140,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Po // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp index 93e73bc4856..aae38186b03 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/Policy_ForwardA.h" +#include "Policy_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -331,5 +329,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.h b/TAO/tao/AnyTypeCode/Policy_ForwardA.h index 7626097a3b9..88c0b82f339 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.h +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.h @@ -37,7 +37,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Policy_ForwardC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -99,8 +98,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType); TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp index 166de771bb6..0ffe043ddbe 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/PortableInterceptorA.h" +#include "PortableInterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.h b/TAO/tao/AnyTypeCode/PortableInterceptorA.h index 4de58d5653e..e257fccb813 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -52,8 +50,6 @@ namespace PortableInterceptor } // module PortableInterceptor -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp index db48e1583f7..a96abe13a0b 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp @@ -1,13 +1,12 @@ // $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, @@ -137,5 +136,3 @@ 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 027100bb476..08b0025560c 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -18,11 +18,9 @@ #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 { @@ -200,8 +198,6 @@ 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 efd9091a125..7f7a5ea6fe8 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType> ACE_INLINE TAO::TypeCode::Recursive_Type<TypeCodeBase, @@ -149,5 +147,3 @@ 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 ac0be52fc3b..fd9a09754c5 100644 --- a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h +++ b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h @@ -24,9 +24,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Null_RefCount_Policy; @@ -104,8 +101,6 @@ 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 76016fe93fe..a3b7c2e458c 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -11,7 +11,6 @@ # include "tao/AnyTypeCode/Sequence_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename TypeCodeType, class RefCountPolicy> bool @@ -145,6 +144,5 @@ 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 3b8cd242ade..555511402c0 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -23,9 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -118,7 +115,6 @@ 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 27de6a56926..81e7add5646 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename TypeCodeType, class RefCountPolicy> ACE_INLINE TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence ( @@ -23,5 +21,3 @@ 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 e967f69c096..d0ab50e8dde 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -13,7 +13,6 @@ ACE_RCSID (tao, Sequence_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, @@ -146,5 +145,3 @@ 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 7c3d4746fbc..7975d403192 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -116,7 +115,6 @@ 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 b433031f883..27e98729656 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::Sequence ( @@ -16,5 +14,3 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, , length_ (length) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ServicesA.cpp b/TAO/tao/AnyTypeCode/ServicesA.cpp index 0030c4e2c44..2fa2316ff53 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.cpp +++ b/TAO/tao/AnyTypeCode/ServicesA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ServicesA.h" +#include "ServicesA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -518,5 +516,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ServicesA.h b/TAO/tao/AnyTypeCode/ServicesA.h index 7a422b3358a..87b6aca143f 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.h +++ b/TAO/tao/AnyTypeCode/ServicesA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -123,8 +121,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.cpp b/TAO/tao/AnyTypeCode/ShortSeqA.cpp index f876b863891..ed70a459f81 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ShortSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ShortSeqA.h" +#include "ShortSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.h b/TAO/tao/AnyTypeCode/ShortSeqA.h index 5c450473eb1..f3f6f53c485 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.h +++ b/TAO/tao/AnyTypeCode/ShortSeqA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/StringSeqA.cpp b/TAO/tao/AnyTypeCode/StringSeqA.cpp index 1016edf61df..df52b396d70 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/StringSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/StringSeqA.h" +#include "StringSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -143,5 +141,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/StringSeqA.h b/TAO/tao/AnyTypeCode/StringSeqA.h index c26b6c77dee..a97892b5181 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.h +++ b/TAO/tao/AnyTypeCode/StringSeqA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // no TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index bae404af34e..8542fc7ce99 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -10,7 +10,6 @@ # include "tao/AnyTypeCode/String_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class RefCountPolicy> bool @@ -88,6 +87,5 @@ 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 86a7270f12b..628e251c491 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -95,8 +93,6 @@ 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 2f5fb0b6487..90e8e887c3b 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind, @@ -14,5 +12,3 @@ 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 60783babaec..a0817ca8c31 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -13,8 +13,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal ( TAO_OutputCDR & cdr, @@ -84,5 +82,3 @@ 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 8911843a9ee..9bd90692793 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -98,8 +97,6 @@ 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 726d9242f8e..4d42413daa1 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String ( CORBA::TCKind kind, @@ -14,5 +12,3 @@ 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/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h index 670e6a835ba..14287963745 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h @@ -28,9 +28,6 @@ #include "tao/AnyTypeCode/String_TypeCode.h" #include "tao/AnyTypeCode/True_RefCount_Policy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCodeFactory @@ -74,7 +71,6 @@ namespace TAO } // End namespace TypeCodeFactory } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index aa50e7bdf78..65ad7720597 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -17,7 +17,6 @@ #include "ace/Dynamic_Service.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -344,6 +343,4 @@ 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 df44f2d2a3a..dc356f07447 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -27,7 +27,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -138,7 +137,6 @@ 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 ad95ae544fa..eb3da52ae7e 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -46,5 +45,3 @@ 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 8228c5de001..41211b42d25 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -20,8 +20,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -316,5 +314,3 @@ 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 dea9405238b..b923b4c9917 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -28,7 +28,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -143,7 +142,6 @@ 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 d17483fe23f..f32a858b845 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Struct<char const *, @@ -22,5 +21,3 @@ TAO::TypeCode::Struct<char const *, , fields_ (fields) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index c11f3984ef3..44271253ab5 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "tao/AnyTypeCode/SystemExceptionA.h" -#include "tao/AnyTypeCode/Any_SystemException.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Enum_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "SystemExceptionA.h" +#include "Any_SystemException.h" +#include "Any_Dual_Impl_T.h" +#include "TypeCode.h" +#include "TypeCode_Constants.h" +#include "Enum_TypeCode_Static.h" +#include "TypeCode_Struct_Field.h" +#include "Struct_TypeCode_Static.h" +#include "Null_RefCount_Policy.h" #include "tao/CORBA_String.h" @@ -16,12 +16,9 @@ ACE_RCSID (tao, SystemExceptionA, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ // List of standard/system exceptions ... used to create static // storage for their typecodes. @@ -181,5 +178,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &any, \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.h b/TAO/tao/AnyTypeCode/SystemExceptionA.h index b6ca62d2e55..75fc6dfd459 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.h +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.h @@ -20,8 +20,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -84,8 +82,6 @@ namespace CORBA } // End CORBA namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SYSTEMEXCEPTIONA_H */ diff --git a/TAO/tao/AnyTypeCode/TAOA.cpp b/TAO/tao/AnyTypeCode/TAOA.cpp index cf036da5c50..4230f001fc7 100644 --- a/TAO/tao/AnyTypeCode/TAOA.cpp +++ b/TAO/tao/AnyTypeCode/TAOA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/TAOA.h" +#include "TAOA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -164,5 +162,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TAOA.h b/TAO/tao/AnyTypeCode/TAOA.h index 1a68c91f64b..131c8b6eff0 100644 --- a/TAO/tao/AnyTypeCode/TAOA.h +++ b/TAO/tao/AnyTypeCode/TAOA.h @@ -43,8 +43,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -76,8 +74,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint* TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h index e0d8853654d..b66ae8db4d2 100644 --- a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h +++ b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h @@ -1,20 +1,113 @@ // -*- C++ -*- -// ------------------------------------------------------------- +//============================================================================= /** - * @file TC_Constants_Forward.h + * @file TC_Constants_Forward.h * - * $Id$ + * $Id$ * - * Backward compatibility header. + * Forward declare the type code constants used in the ORB. * - * @deprecated Use TypeCode_Constants.h instead. + * @author Jeff Parsons */ -// ------------------------------------------------------------- +//============================================================================= #ifndef TAO_TC_CONSTANTS_FORWARD_H #define TAO_TC_CONSTANTS_FORWARD_H -#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include /**/ "ace/pre.h" -#endif /* TAO_TC_CONSTANTS_FORWARD_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/TimeBaseA.cpp b/TAO/tao/AnyTypeCode/TimeBaseA.cpp index 1cb54f59417..444c8d69f0a 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.cpp +++ b/TAO/tao/AnyTypeCode/TimeBaseA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/TimeBaseA.h" +#include "TimeBaseA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -271,5 +269,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.h b/TAO/tao/AnyTypeCode/TimeBaseA.h index c18a4a4f8d2..c75cc8715c4 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.h +++ b/TAO/tao/AnyTypeCode/TimeBaseA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TimeBase { @@ -123,8 +121,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Tim // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 2c7190d82bf..3b5b3fab354 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/AnyTypeCode/True_RefCount_Policy.h" +#include "True_RefCount_Policy.h" #ifndef __ACE_INLINE__ # include "True_RefCount_Policy.inl" @@ -11,10 +11,7 @@ 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 6bef507fae0..89035c00f47 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -29,8 +29,6 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -108,7 +106,6 @@ 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 db9631237de..87b1b1b9159 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::True_RefCount_Policy::True_RefCount_Policy (void) @@ -24,5 +23,3 @@ 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 4af8e87ee16..a84b422f4b0 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/AnyTypeCode/TypeCode.h" +#include "TypeCode.h" ACE_RCSID (tao, TypeCode, @@ -8,7 +8,7 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "tao/AnyTypeCode/TypeCode.inl" +# include "TypeCode.inl" #endif /* ! __ACE_INLINE__ */ #include "tao/SystemException.h" @@ -18,7 +18,6 @@ ACE_RCSID (tao, #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::TypeCode::~TypeCode (void) { @@ -333,7 +332,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex) CORBA::Exception * CORBA::TypeCode::BadKind::_tao_duplicate (void) const { - CORBA::Exception *result = 0; + CORBA::Exception *result; ACE_NEW_RETURN (result, CORBA::TypeCode::BadKind (*this), 0); @@ -486,4 +485,3 @@ 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 93edd808684..dd9a6d7b2bb 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -42,8 +42,6 @@ #endif #define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var; @@ -581,7 +579,6 @@ 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 eb044d6641f..64cd68fe7c1 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -4,8 +4,6 @@ #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::TypeCode_ptr obj) { @@ -158,5 +156,3 @@ 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/TypeCodeA.cpp b/TAO/tao/AnyTypeCode/TypeCodeA.cpp index aa229493ecc..6ff09fdf2cc 100644 --- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp +++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "Struct_TypeCode_Static.h" +#include "Null_RefCount_Policy.h" ACE_RCSID (tao, @@ -9,8 +9,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -59,5 +57,3 @@ CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_BadKind = CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_Bounds = &TAO::TypeCode::tc_Bounds; - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 03740852534..4771d75d95b 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -21,10 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -81,7 +77,6 @@ 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 915e4ed9411..d94e65040a6 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl @@ -4,7 +4,6 @@ #include "tao/AnyTypeCode/TypeCode_Traits.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename STRING_TYPE> ACE_INLINE @@ -50,5 +49,3 @@ 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 769d6760258..3ad634f15a7 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -1,38 +1,35 @@ // $Id$ -#include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h" +#include "TypeCode_CDR_Extraction.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/True_RefCount_Policy.h" +#include "TypeCode_Constants.h" +#include "True_RefCount_Policy.h" -#include "tao/AnyTypeCode/Alias_TypeCode.h" -#include "tao/AnyTypeCode/Enum_TypeCode.h" -#include "tao/AnyTypeCode/Fixed_TypeCode.h" -#include "tao/AnyTypeCode/Objref_TypeCode.h" -#include "tao/AnyTypeCode/Sequence_TypeCode.h" -#include "tao/AnyTypeCode/String_TypeCode.h" -#include "tao/AnyTypeCode/Struct_TypeCode.h" -#include "tao/AnyTypeCode/Union_TypeCode.h" -#include "tao/AnyTypeCode/Value_TypeCode.h" -#include "tao/AnyTypeCode/Any.h" +#include "Alias_TypeCode.h" +#include "Enum_TypeCode.h" +#include "Fixed_TypeCode.h" +#include "Objref_TypeCode.h" +#include "Sequence_TypeCode.h" +#include "String_TypeCode.h" +#include "Struct_TypeCode.h" +#include "Union_TypeCode.h" +#include "Value_TypeCode.h" -#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" +#include "Recursive_Type_TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Case_T.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/AnyTypeCode/TypeCode_Value_Field.h" +#include "TypeCode_Case_T.h" +#include "TypeCode_Struct_Field.h" +#include "TypeCode_Value_Field.h" #include "tao/CDR.h" #include "ace/Array_Base.h" -#include "ace/Value_Ptr.h" ACE_RCSID (tao, TypeCode_CDR_Extraction, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -105,7 +102,7 @@ namespace TAO::TypeCodeFactory::TC_Info_List & infos); bool find_recursive_tc (char const * id, - TAO::TypeCodeFactory::TC_Info_List & tcs, + CORBA::TypeCode_ptr & tc, TAO::TypeCodeFactory::TC_Info_List & infos) { // See comments above for rationale behind using an array instead @@ -119,18 +116,12 @@ namespace if (ACE_OS::strcmp (info.id, id) == 0) { - // We have a mathing id, so store the typecode in the out array - // and then compare the others. - size_t const old_size = tcs.size (); - if (tcs.size (old_size + 1) == -1) // Incremental growth -- *sigh* - return false; - - TAO::TypeCodeFactory::TC_Info & new_info = tcs[old_size]; - new_info.type = info.type; + tc = info.type; + return true; } } - return (tcs.size () > 0) ; + return false; } } @@ -415,8 +406,7 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind, // Check if struct TypeCode is recursive. - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, infos)) + if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos)) { // Set remaining parameters. @@ -425,23 +415,14 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind, member_array_type> recursive_typecode_type; - size_t const len = recursive_tc.size (); - - for (size_t i = 0; i < len; ++i) - { - TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i]; - - recursive_typecode_type * const rtc = - dynamic_cast<recursive_typecode_type *> (info.type); + recursive_typecode_type * const rtc = + dynamic_cast<recursive_typecode_type *> (tc); - ACE_ASSERT (rtc); + ACE_ASSERT (rtc); - rtc->struct_parameters (name.in (), - fields, - nfields); - } - - tc = recursive_tc[0].type; + rtc->struct_parameters (name.in (), + fields, + nfields); } else { @@ -512,7 +493,7 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, { elem_type & member = cases[i]; - TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case = 0; + TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case; // Ugly. *sigh* switch (discriminant_kind) @@ -663,9 +644,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, case_array_type, TAO::True_RefCount_Policy> typecode_type; - // Check if we have recursive members, this could be multiple - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) + // Check if union TypeCode is recursive. + if (find_recursive_tc (id.in (), tc, infos)) { // Set remaining parameters. @@ -674,25 +654,16 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, case_array_type> recursive_typecode_type; - size_t const len = recursive_tc.size (); - - for (size_t i = 0; i < len; ++i) - { - TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i]; - - recursive_typecode_type * const rtc = - dynamic_cast<recursive_typecode_type *> (info.type); + recursive_typecode_type * const rtc = + dynamic_cast<recursive_typecode_type *> (tc); - ACE_ASSERT (rtc); + ACE_ASSERT (rtc); - rtc->union_parameters (name.in (), - discriminant_type, - cases, // Will be copied. - ncases, - default_index); - } - - tc = recursive_tc[0].type; + rtc->union_parameters (name.in (), + discriminant_type, + cases, // Will be copied. + ncases, + default_index); } else { @@ -1019,8 +990,7 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind, TAO::True_RefCount_Policy> typecode_type; // Check if valuetype/eventtype TypeCode is recursive. - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) + if (find_recursive_tc (id.in (), tc, infos)) { // Set remaining parameters. @@ -1029,24 +999,16 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind, member_array_type> recursive_typecode_type; - size_t const len = recursive_tc.size (); - - for (size_t i = 0; i < len; ++i) - { - TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i]; - - recursive_typecode_type * const rtc = - dynamic_cast<recursive_typecode_type *> (info.type); + recursive_typecode_type * const rtc = + dynamic_cast<recursive_typecode_type *> (tc); - ACE_ASSERT (rtc); + ACE_ASSERT (rtc); - rtc->valuetype_parameters (name.in (), - type_modifier, - concrete_base, - fields, // Will be copied. - nfields); - } - tc = recursive_tc[0].type; + rtc->valuetype_parameters (name.in (), + type_modifier, + concrete_base, + fields, // Will be copied. + nfields); } else { @@ -1258,132 +1220,94 @@ namespace // Don't bother demarshaling the rest of the parameters. They will // be handled by the top-level TypeCode demarshaling call. - bool new_tc = false; switch (kind) { case CORBA::tk_struct: { - // Check if we already have a tc for this type, if yes, use that - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) - { - tc = recursive_tc[0].type; - } - else - { - new_tc = true; - - typedef ACE_Array_Base< - TAO::TypeCode::Struct_Field< - CORBA::String_var, - CORBA::TypeCode_var> > member_array_type; - - typedef TAO::TypeCode::Struct< - CORBA::String_var, - CORBA::TypeCode_var, - member_array_type, - TAO::True_RefCount_Policy> typecode_type; - - typedef TAO::TypeCode::Recursive_Type<typecode_type, - CORBA::TypeCode_var, - member_array_type> - recursive_typecode_type; - - ACE_NEW_RETURN (tc, - recursive_typecode_type (kind, - id.in ()), - false); - } + typedef ACE_Array_Base< + TAO::TypeCode::Struct_Field< + CORBA::String_var, + CORBA::TypeCode_var> > member_array_type; + + typedef TAO::TypeCode::Struct< + CORBA::String_var, + CORBA::TypeCode_var, + member_array_type, + TAO::True_RefCount_Policy> typecode_type; + + typedef TAO::TypeCode::Recursive_Type<typecode_type, + CORBA::TypeCode_var, + member_array_type> + recursive_typecode_type; + + ACE_NEW_RETURN (tc, + recursive_typecode_type (kind, + id.in ()), + false); } break; case CORBA::tk_union: { - // Check if we already have a tc for this type, if yes, use that - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) - { - tc = recursive_tc[0].type; - } - else - { - new_tc = true; - - typedef union_case_array_type member_array_type; - - typedef TAO::TypeCode::Union< - CORBA::String_var, - CORBA::TypeCode_var, - member_array_type, - TAO::True_RefCount_Policy> typecode_type; - - typedef TAO::TypeCode::Recursive_Type<typecode_type, - CORBA::TypeCode_var, - member_array_type> - recursive_typecode_type; - - ACE_NEW_RETURN (tc, - recursive_typecode_type (kind, - id.in ()), - false); - } + typedef union_case_array_type member_array_type; + + typedef TAO::TypeCode::Union< + CORBA::String_var, + CORBA::TypeCode_var, + member_array_type, + TAO::True_RefCount_Policy> typecode_type; + + typedef TAO::TypeCode::Recursive_Type<typecode_type, + CORBA::TypeCode_var, + member_array_type> + recursive_typecode_type; + + ACE_NEW_RETURN (tc, + recursive_typecode_type (kind, + id.in ()), + false); } break; case CORBA::tk_value: case CORBA::tk_event: { - // Check if we already have a tc for this type, if yes, use that - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) - { - tc = recursive_tc[0].type; - } - else - { - new_tc = true; - - typedef ACE_Array_Base< - TAO::TypeCode::Value_Field< - CORBA::String_var, - CORBA::TypeCode_var> > member_array_type; - - typedef TAO::TypeCode::Value< - CORBA::String_var, - CORBA::TypeCode_var, - member_array_type, - TAO::True_RefCount_Policy> typecode_type; - - typedef TAO::TypeCode::Recursive_Type<typecode_type, - CORBA::TypeCode_var, - member_array_type> - recursive_typecode_type; - - ACE_NEW_RETURN (tc, - recursive_typecode_type (kind, - id.in ()), - false); - } + typedef ACE_Array_Base< + TAO::TypeCode::Value_Field< + CORBA::String_var, + CORBA::TypeCode_var> > member_array_type; + + typedef TAO::TypeCode::Value< + CORBA::String_var, + CORBA::TypeCode_var, + member_array_type, + TAO::True_RefCount_Policy> typecode_type; + + typedef TAO::TypeCode::Recursive_Type<typecode_type, + CORBA::TypeCode_var, + member_array_type> + recursive_typecode_type; + + ACE_NEW_RETURN (tc, + recursive_typecode_type (kind, + id.in ()), + false); } break; default: return false; // We should never get here. }; - // Only when we created a new tc add it to the list. - if (new_tc) - { - size_t const old_size = infos.size (); - if (infos.size (old_size + 1) == -1) // Incremental growth -- *sigh* - return false; + size_t const old_size = infos.size (); + if (infos.size (old_size + 1) == -1) // Incremental growth -- *sigh* + return false; - TAO::TypeCodeFactory::TC_Info & info = infos[old_size]; + TAO::TypeCodeFactory::TC_Info & info = infos[old_size]; - ACE_DECLARE_NEW_CORBA_ENV; - info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); // Should never throw! + ACE_DECLARE_NEW_CORBA_ENV; + info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (false); // Should never throw! - info.type = tc; - } + info.type = tc; return true; } @@ -1399,5 +1323,3 @@ 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 0e6d6015c97..b7571fbfbf4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h @@ -23,11 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <class T> class ACE_Array_Base; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +template <class T> class ACE_Array_Base; namespace TAO { @@ -193,7 +190,6 @@ 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 67edee2d6b8..9ed73f48bc8 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -3,14 +3,13 @@ #ifndef TAO_TYPECODE_CASE_CPP #define TAO_TYPECODE_CASE_CPP -#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" +#include "TypeCode_Case_Base_T.h" #include "ace/OS_NS_string.h" #ifndef __ACE_INLINE__ # 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) @@ -84,6 +83,4 @@ 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 638051bcb6a..2a646e7724a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -23,7 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -168,9 +167,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { @@ -188,9 +184,7 @@ namespace ACE } }; -} // End namespace ACE. - -ACE_END_VERSIONED_NAMESPACE_DECL +} // End namespace ACE namespace. #ifdef __ACE_INLINE__ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index 4bd6b4f8a79..bf992fde3f3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -5,7 +5,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/TypeCode_Traits.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType> ACE_INLINE @@ -75,5 +74,3 @@ 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 fc7533e98ae..579f968fd12 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_TYPECODE_CASE_T_CPP #define TAO_TYPECODE_CASE_T_CPP -#include "tao/AnyTypeCode/TypeCode_Case_T.h" +#include "TypeCode_Case_T.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" @@ -13,7 +13,6 @@ # include "tao/AnyTypeCode/TypeCode_Case_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -144,7 +143,7 @@ TAO::TypeCode::Case_T<DiscriminatorType, StringType, TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const { - CORBA::Any * value = 0; + CORBA::Any * value; ACE_NEW_THROW_EX (value, CORBA::Any, @@ -159,6 +158,5 @@ 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 c0cff25b880..516127d0054 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -128,7 +127,6 @@ 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 f95b599c795..b6ac33bd18e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename DiscriminatorType, typename StringType, typename TypeCodeType> @@ -30,5 +27,3 @@ TAO::TypeCode::Case_T<DiscriminatorType, , label_ (member_label) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp index eb9bd81746b..fe6b46d2c1f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "TypeCode_Constants.h" ACE_RCSID (tao, @@ -9,12 +9,11 @@ ACE_RCSID (tao, "$Id$") -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/Empty_Param_TypeCode.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/String_TypeCode_Static.h" +#include "Null_RefCount_Policy.h" +#include "Empty_Param_TypeCode.h" +#include "Objref_TypeCode_Static.h" +#include "String_TypeCode_Static.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -110,5 +109,3 @@ namespace CORBA TypeCode_ptr const _tc_Home = &TAO::TypeCode::tc_Home; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.h b/TAO/tao/AnyTypeCode/TypeCode_Constants.h index 2aea3471df7..8b057ace36d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.h @@ -21,10 +21,6 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -62,63 +58,8 @@ 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_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 1a3d8c9deb4..ad1fb0b35c2 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h @@ -24,7 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -84,7 +83,6 @@ 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 7c1fe02b47e..921f00717e8 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Null_RefCount_Policy; @@ -119,7 +117,6 @@ 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 c421189f0f5..7fbfcb20501 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h @@ -23,7 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -86,7 +85,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp index 5773812563a..d77d9b59c07 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ULongLongSeqA.h" +#include "ULongLongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.h b/TAO/tao/AnyTypeCode/ULongLongSeqA.h index 65fb4366d8f..0d5ca2d7bd9 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.h @@ -37,8 +37,6 @@ #include "tao/ULongLongSeqC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::ULongLongSeq*); TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::ULongLongSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongSeqA.cpp index 7acfbea8976..f48c8306497 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ULongSeqA.h" +#include "ULongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.h b/TAO/tao/AnyTypeCode/ULongSeqA.h index ed4eac48536..f093cec9617 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongSeqA.h @@ -38,8 +38,6 @@ #include "tao/ULongSeqC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp index 582d15d69d0..8150d15bef7 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/UShortSeqA.h" +#include "UShortSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h index 824246509de..59de79c234c 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.h +++ b/TAO/tao/AnyTypeCode/UShortSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -95,8 +93,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 25aba5c6340..c88e8ec1236 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -3,19 +3,18 @@ #ifndef TAO_UNION_TYPECODE_CPP #define TAO_UNION_TYPECODE_CPP -#include "tao/AnyTypeCode/Union_TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" +#include "Union_TypeCode.h" +#include "TypeCode_Case_Base_T.h" #ifndef __ACE_INLINE__ -# include "tao/AnyTypeCode/Union_TypeCode.inl" +# include "Union_TypeCode.inl" #endif /* !__ACE_INLINE__ */ #include "tao/SystemException.h" -#include "tao/AnyTypeCode/Any.h" +#include "Any.h" #include "ace/Value_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -58,22 +57,11 @@ TAO::TypeCode::Union<StringType, if (!success) return false; - offset += enc.total_length (); - for (CORBA::ULong i = 0; i < this->ncases_; ++i) { - TAO_OutputCDR case_enc; - offset = ACE_align_binary (offset, - ACE_CDR::LONG_ALIGN); - case_type const & c = *this->cases_[i]; - if (!c.marshal (case_enc, offset)) - return false; - - offset += case_enc.total_length (); - - if (!enc.write_octet_array_mb (case_enc.begin ())) + if (!c.marshal (enc, offset + enc.total_length ())) return false; } @@ -127,28 +115,28 @@ TAO::TypeCode::Union<StringType, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -167,13 +155,13 @@ TAO::TypeCode::Union<StringType, lhs_case.equal (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_case) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -193,27 +181,27 @@ TAO::TypeCode::Union<StringType, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -232,13 +220,13 @@ TAO::TypeCode::Union<StringType, lhs_case.equivalent (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_case) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -407,7 +395,7 @@ TAO::TypeCode::Union<StringType, if (this->default_index_ > -1 && static_cast<CORBA::ULong> (this->default_index_) == index) { - CORBA::Any * any = 0; + CORBA::Any * any; ACE_NEW_THROW_EX (any, CORBA::Any, CORBA::NO_MEMORY ()); @@ -458,6 +446,4 @@ 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 8089aeea48f..92117ba92fd 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -161,8 +160,6 @@ 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 28ac14d3537..84dfb32fa0b 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename StringType, typename TypeCodeType, class CaseArrayType, @@ -55,5 +53,3 @@ 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 2d5677d317e..714b16cfa96 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -13,13 +13,11 @@ #include "ace/Value_Ptr.h" -ACE_RCSID (AnyTypeCode, +ACE_RCSID (tao, Union_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, @@ -58,23 +56,13 @@ TAO::TypeCode::Union<char const *, if (!success) return false; - offset += enc.total_length (); - // Note that we handle the default case below, too. - for (CORBA::ULong i = 0; i < this->ncases_; ++i) + for (unsigned int i = 0; i < this->ncases_; ++i) { - TAO_OutputCDR case_enc; - offset = ACE_align_binary (offset, - ACE_CDR::LONG_ALIGN); case_type const & c = *this->cases_[i]; - if (!c.marshal (case_enc, offset)) - return false; - - offset += case_enc.total_length (); - - if (!enc.write_octet_array_mb (case_enc.begin ())) + if (!c.marshal (enc, offset + enc.total_length ())) return false; } @@ -117,28 +105,28 @@ TAO::TypeCode::Union<char const *, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_discriminators = Traits<char const *>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -157,13 +145,13 @@ TAO::TypeCode::Union<char const *, lhs_case.equal (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_case) - return false; + return 0; } - return true; + return 1; } CORBA::Boolean @@ -180,27 +168,27 @@ TAO::TypeCode::Union<char const *, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_discriminators = Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -219,13 +207,13 @@ TAO::TypeCode::Union<char const *, lhs_case.equivalent (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_case) - return false; + return 0; } - return true; + return 1; } CORBA::TypeCode_ptr @@ -418,5 +406,3 @@ 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 bf58345e03f..b0a507ca168 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -160,7 +159,6 @@ 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 4398e2a0a62..019a8ba2a2f 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, @@ -25,5 +23,3 @@ TAO::TypeCode::Union<char const *, , cases_ (cases) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl index 2887587dddd..4cd346c5049 100644 --- a/TAO/tao/AnyTypeCode/ValueModifier.pidl +++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * ValueModifier.pidl */ // ================================================================ diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.cpp b/TAO/tao/AnyTypeCode/ValueModifierA.cpp index 5f23127315a..0a93f94dc26 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ValueModifierA.h" +#include "ValueModifierA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" @@ -33,8 +33,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -54,4 +52,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.h b/TAO/tao/AnyTypeCode/ValueModifierA.h index ff165ad8eda..479dc4c4052 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.h +++ b/TAO/tao/AnyTypeCode/ValueModifierA.h @@ -58,8 +58,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -82,8 +80,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.cpp b/TAO/tao/AnyTypeCode/ValueModifierC.cpp index 9606aaf3d1b..76644c8b3c0 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/ValueModifierC.h" +#include "ValueModifierC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,11 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.h b/TAO/tao/AnyTypeCode/ValueModifierC.h index 424e4e3b61b..2bfe5a25b4e 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.h +++ b/TAO/tao/AnyTypeCode/ValueModifierC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -108,8 +106,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 8955d4be01b..4be37413b75 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -16,7 +16,6 @@ # include "tao/AnyTypeCode/Value_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -125,29 +124,29 @@ TAO::TypeCode::Value<StringType, CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_concrete_base_types) - return false; + return 0; CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -158,37 +157,37 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; char const * const lhs_name = Traits<StringType>::get_string (lhs_field.name);; char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_members) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -205,32 +204,32 @@ TAO::TypeCode::Value<StringType, { CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equivalent_concrete_base_types = this->equivalent (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_concrete_base_types) - return false; + return 0; // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -242,28 +241,28 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_types) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -460,6 +459,5 @@ 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 ffc18532e6f..2578a304b53 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -28,7 +28,6 @@ #include "tao/AnyTypeCode/ValueModifierC.h" #include "tao/AnyTypeCode/VisibilityC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -161,7 +160,6 @@ 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 6a63efab53e..9a8b31f0ddb 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -56,5 +55,3 @@ 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 c222edfa947..369aeae045c 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -18,7 +18,6 @@ ACE_RCSID (tao, Value_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Value<char const *, @@ -116,29 +115,29 @@ TAO::TypeCode::Value<char const *, CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_concrete_base_types) - return false; + return 0; CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -149,37 +148,37 @@ TAO::TypeCode::Value<char const *, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; char const * const lhs_name = Traits<char const *>::get_string (lhs_field.name);; char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_members) - return false; + return 0; } - return true; + return 1; } CORBA::Boolean @@ -193,32 +192,32 @@ TAO::TypeCode::Value<char const *, { CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equivalent_concrete_base_types = this->equivalent (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_concrete_base_types) - return false; + return 0; // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -231,28 +230,28 @@ TAO::TypeCode::Value<char const *, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_types) - return false; + return 0; } - return true; + return 1; } CORBA::TypeCode_ptr @@ -421,5 +420,3 @@ 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 57ba318ab03..9db721919f5 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -29,7 +29,6 @@ #include "tao/AnyTypeCode/VisibilityC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -159,7 +158,6 @@ 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 3341e18053f..70c7d6cf1b1 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, @@ -26,5 +24,3 @@ TAO::TypeCode::Value<char const *, , fields_ (fields) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl index 715b312bdf1..44cece777a3 100644 --- a/TAO/tao/AnyTypeCode/Visibility.pidl +++ b/TAO/tao/AnyTypeCode/Visibility.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Visibilty.pidl */ // ================================================================ diff --git a/TAO/tao/AnyTypeCode/VisibilityA.cpp b/TAO/tao/AnyTypeCode/VisibilityA.cpp index ce31b456908..95ae55adc13 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityA.cpp @@ -25,15 +25,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/VisibilityA.h" +#include "VisibilityA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -53,4 +51,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/VisibilityA.h b/TAO/tao/AnyTypeCode/VisibilityA.h index c791d479e08..04f9ebde904 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.h +++ b/TAO/tao/AnyTypeCode/VisibilityA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -84,8 +82,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/VisibilityC.cpp b/TAO/tao/AnyTypeCode/VisibilityC.cpp index d8c674edc02..76f74d94f2f 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/VisibilityC.h" +#include "VisibilityC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,11 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/VisibilityC.h b/TAO/tao/AnyTypeCode/VisibilityC.h index 4f6e607ba23..124188ba2f7 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.h +++ b/TAO/tao/AnyTypeCode/VisibilityC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -98,8 +96,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.cpp b/TAO/tao/AnyTypeCode/WCharSeqA.cpp index 978836022a6..c8d8ecee99d 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WCharSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/WCharSeqA.h" +#include "WCharSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.h b/TAO/tao/AnyTypeCode/WCharSeqA.h index 8935210cc23..ab57e949bdd 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.h +++ b/TAO/tao/AnyTypeCode/WCharSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WCharSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WCharSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WCharSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.cpp b/TAO/tao/AnyTypeCode/WStringSeqA.cpp index f3f468704e4..41067661a25 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WStringSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/WStringSeqA.h" +#include "WStringSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -143,5 +141,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.h b/TAO/tao/AnyTypeCode/WStringSeqA.h index b9357c80326..9f01c462bc2 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.h +++ b/TAO/tao/AnyTypeCode/WStringSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WStringSeq*); / TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WStringSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WStringSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 9c6fd0a62f2..7b37a76f712 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/WrongTransactionA.h" +#include "WrongTransactionA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -147,5 +145,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h index 745c0aa5f39..08bce947959 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.h +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -95,8 +93,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 36a8721fa7d..bb14170a683 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -38,8 +38,6 @@ 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 @@ -415,13 +413,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... - CORBA::Short short_v = CORBA::Short(); - CORBA::UShort ushort_v = CORBA::UShort(); - CORBA::Long long_v = CORBA::Long(); - CORBA::ULong ulong_v = CORBA::ULong(); - CORBA::ULong enum_v = CORBA::ULong(); - CORBA::Char char_v = CORBA::Char(); - CORBA::WChar wchar_v = CORBA::WChar(); + CORBA::Short short_v; + CORBA::UShort ushort_v; + CORBA::Long long_v; + CORBA::ULong ulong_v; + CORBA::ULong enum_v; + CORBA::Char char_v; + CORBA::WChar wchar_v; CORBA::Boolean boolean_v = false; switch (kind) @@ -1321,5 +1319,3 @@ 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/orb_typesA.cpp b/TAO/tao/AnyTypeCode/orb_typesA.cpp index e1967ebdfd8..92c9bc9bc46 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.cpp +++ b/TAO/tao/AnyTypeCode/orb_typesA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/orb_typesA.h" +#include "orb_typesA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -33,8 +33,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -114,4 +112,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/orb_typesA.h b/TAO/tao/AnyTypeCode/orb_typesA.h index 84b2fcc5c0f..1585e465596 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.h +++ b/TAO/tao/AnyTypeCode/orb_typesA.h @@ -37,7 +37,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orb_typesC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -70,8 +69,6 @@ namespace CORBA } // module CORBA -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index dcad0cb9c3f..31fd7a14552 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -19,10 +19,10 @@ // // ============================================================================ -#include "tao/AnyTypeCode/Marshal.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" -#include "tao/AnyTypeCode/Any.h" +#include "Marshal.h" +#include "TypeCode.h" +#include "Any_Unknown_IDL_Type.h" +#include "Any.h" #include "tao/debug.h" #include "tao/Valuetype_Adapter.h" @@ -36,14 +36,12 @@ ACE_RCSID (tao, skip, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // Status of skip operation. TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -88,7 +86,8 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, retval = TAO::TRAVERSE_STOP; // we are not a primitive type } - if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping) + if (retval == TAO::TRAVERSE_CONTINUE + && continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -125,7 +124,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // Typecode kind. CORBA::ULong kind; @@ -133,7 +132,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, // Decode the "kind" field of the typecode from the stream. continue_skipping = stream->read_ulong (kind); - if (continue_skipping) + if (continue_skipping == 1) { // Typecodes with empty parameter lists all have preallocated // constants. We use those to reduce memory consumption and @@ -206,7 +205,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, } } - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -226,7 +225,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // specifies the number of bytes in the Principal CORBA::ULong len; @@ -237,7 +236,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, continue_skipping = stream->skip_bytes (len); } - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -257,7 +256,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // return status TAO::traverse_status retval = @@ -299,7 +298,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, continue_skipping = stream->skip_bytes (encap_len); } - if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping) + if (retval == TAO::TRAVERSE_CONTINUE + && continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -366,15 +366,15 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... - CORBA::Short short_v = CORBA::Short(); - CORBA::UShort ushort_v = CORBA::UShort(); - CORBA::Long long_v = CORBA::Long(); - CORBA::ULong ulong_v = CORBA::ULong(); - CORBA::ULong enum_v = CORBA::ULong(); - CORBA::Char char_v = CORBA::Char(); - CORBA::WChar wchar_v = CORBA::WChar(); - CORBA::Boolean boolean_v = false; - + CORBA::Short short_v; + CORBA::UShort ushort_v; + CORBA::Long long_v; + CORBA::ULong ulong_v; + CORBA::ULong enum_v; + CORBA::Char char_v; + CORBA::WChar wchar_v; + CORBA::Boolean boolean_v = false;; + switch (kind) { case CORBA::tk_short: @@ -600,7 +600,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // On decode, omit the check against specified string bounds, and // cope with illegal "zero length" strings (all lengths on the wire @@ -611,7 +611,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, // but we will accept them when it's clear how to do so. continue_skipping = stream->skip_string (); - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -708,7 +708,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, break; default: - while (bounds-- && continue_skipping) + while (bounds-- && continue_skipping == 1) { continue_skipping = TAO_Marshal_Object::perform_skip (tc2.in (), @@ -736,7 +736,8 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; + // retrieve the bounds of the array CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -799,7 +800,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, break; default: - while (bounds-- && continue_skipping) + while (bounds-- && continue_skipping == 1) { int stop = TAO_Marshal_Object::perform_skip (tc2.in (), @@ -807,7 +808,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); if (stop == TAO::TRAVERSE_STOP) - continue_skipping = false; + continue_skipping = 0; } break; }// end of switch @@ -831,7 +832,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, { // Typecode of the aliased type. CORBA::TypeCode_var tc2; - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // Status of decode operation. TAO::traverse_status retval = @@ -847,7 +848,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, // tc2->_decr_refcnt (); if (retval == TAO::TRAVERSE_CONTINUE - && continue_skipping) + && continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) @@ -915,7 +916,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + ACE_CDR::Boolean continue_skipping = 1; // On decode, omit the check against specified wstring bounds, and // cope with illegal "zero length" strings (all lengths on the wire @@ -929,7 +930,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, continue_skipping = stream->skip_wstring (); - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) @@ -1039,5 +1040,3 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } - -TAO_END_VERSIONED_NAMESPACE_DECL |