diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 13:42:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 13:42:44 +0000 |
| commit | 1ce4bfe566cacc77785f53a0133d4c40f1d4146b (patch) | |
| tree | 847cc2e50062a205e1c6b9d74eafe66e135e9b73 /TAO/tao/AnyTypeCode | |
| parent | 58c2d4f3d71d8c8258a9e659a37ca03e5f4bc5cf (diff) | |
| download | ATCD-1ce4bfe566cacc77785f53a0133d4c40f1d4146b.tar.gz | |
Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/AnyTypeCode')
80 files changed, 843 insertions, 1175 deletions
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index d968f65b205..ee9de863444 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -83,20 +83,19 @@ CORBA::Boolean TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The CORBA::TypeCode base class already verified equality of the // base attributes (id and name). Perform an equality comparison of // the content. CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<StringType>::get_typecode (this->content_type_)->equal ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } template<typename StringType, @@ -107,7 +106,7 @@ TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -121,8 +120,7 @@ template<typename StringType, CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + RefCountPolicy>::get_compact_typecode_i (void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -138,22 +136,21 @@ TAO::TypeCode::Alias<StringType, CORBA::TypeCode_var compact_content_type = Traits<StringType>::get_typecode ( this->content_type_)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); if (this->kind_ == CORBA::tk_alias) { return adapter->create_alias_tc (this->attributes_.id (), "", /* empty name */ compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } else { return adapter->create_value_box_tc (this->attributes_.id (), "", /* empty name */ compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } } @@ -164,7 +161,7 @@ char const * TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -178,7 +175,7 @@ char const * TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -192,7 +189,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, RefCountPolicy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 201f3f001fc..d9f8b60b4c1 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -89,15 +89,12 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr content_type_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index c3c9e26c1a6..a2db7f4602c 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -73,29 +73,26 @@ TAO::TypeCode::Alias<char const *, CORBA::Boolean TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + TAO::Null_RefCount_Policy>::equal_i ( + CORBA::TypeCode_ptr tc) const { // The CORBA::TypeCode base class already verified equality of the // base attributes (id and name). Perform an equality comparison of // the content. CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<char const *>::get_typecode (this->content_type_)->equal ( - rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + rhs_content_type.in ()); } CORBA::Boolean TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::equivalent_i ( - CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + CORBA::TypeCode_ptr) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -107,7 +104,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -123,30 +120,27 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_var compact_content_type = Traits<char const *>::get_typecode ( this->content_type_)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); if (this->kind_ == CORBA::tk_alias) { return adapter->create_alias_tc (this->attributes_.id (), "", /* empty name */ compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } else { return adapter->create_value_box_tc (this->attributes_.id (), "", /* empty name */ - compact_content_type.in () - ACE_ENV_ARG_PARAMETER); + compact_content_type.in ()); } } char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + TAO::Null_RefCount_Policy>::id_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -156,8 +150,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + TAO::Null_RefCount_Policy>::name_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -168,7 +161,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index ce78541df83..709c11039d8 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -87,15 +87,12 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr content_type_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 19a025db41e..22933693e3d 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -133,7 +133,7 @@ CORBA::Any::_tao_byte_order (void) const void CORBA::Any::type (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean equiv = false; @@ -141,8 +141,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc { equiv = this->impl_->_tao_get_typecode ()->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } if (equiv) @@ -151,7 +150,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc } else { - ACE_THROW (CORBA::BAD_TYPECODE ()); + throw ( ::CORBA::BAD_TYPECODE ()); } } @@ -277,7 +276,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) return false; } - ACE_TRY_NEW_ENV + try { TAO::Unknown_IDL_Type *impl = 0; ACE_NEW_RETURN (impl, @@ -286,14 +285,12 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) any.replace (impl); impl->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index b158adc7feb..27ff8682aa1 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -52,7 +52,6 @@ namespace CORBA class ValueBase; class Exception; - class Environment; /** * @class Any @@ -155,7 +154,7 @@ namespace CORBA /// For use along with <<= of a value of aliased type when the alias must /// be preserved. void type (TypeCode_ptr - ACE_ENV_ARG_DECL); + ); /// TAO extension, does not return a duplicate. CORBA::TypeCode_ptr _tao_get_typecode (void) const; diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 97cda1e2d59..4f233f8040e 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -62,13 +62,12 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -125,10 +124,9 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { } - ACE_ENDTRY; return 0; } @@ -164,11 +162,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void) template<typename T_slice, typename T_forany> void TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index f7c0d1656ab..40bfa33c897 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -54,7 +54,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index d5e0e364af3..93f5e5848c1 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -23,10 +23,8 @@ namespace TAO : Any_Impl (0, tc), kind_ (CORBA::tk_null) { - ACE_DECLARE_NEW_CORBA_ENV; this->kind_ = TAO::unaliased_kind (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); switch (this->kind_) { @@ -101,13 +99,12 @@ namespace TAO CORBA::TypeCode_ptr tc, void *_tao_elem) { - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (!_tao_equiv) { @@ -143,8 +140,7 @@ namespace TAO // Get the kind of the type where we are extracting in ie. the // aliased type if there are any. Passing the aliased kind // will not help. - CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TCKind const tck = tc->kind (); // We don't want the rd_ptr of unk to move, in case it is // shared by another Any. This copies the state, not the buffer. @@ -167,10 +163,9 @@ namespace TAO // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -264,20 +259,18 @@ namespace TAO void Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } Any_Basic_Impl * Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc) { - ACE_DECLARE_NEW_CORBA_ENV; - CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind const kind = tc->kind (); TAO::Any_Basic_Impl * retval = 0; diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index 563a252d54a..848056f6ab4 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -57,8 +57,7 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &, CORBA::Long); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR &); static Any_Basic_Impl *create_empty (CORBA::TypeCode_ptr); diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 7c892b754d3..79f8f0e2785 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -53,12 +53,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, CORBA::TypeCode_ptr tc, T & _tao_elem) { - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -108,10 +107,9 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -145,11 +143,11 @@ TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc) template<typename T> void TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index aff9109b34b..48624334d55 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -50,8 +50,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual void _tao_decode (TAO_InputCDR &); virtual const void *value (void) const; static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr); diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 91dc8bdab29..31d096ee324 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -101,12 +101,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -164,10 +163,9 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -203,11 +201,11 @@ TAO::Any_Dual_Impl_T<T>::free_value (void) template<typename T> void TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index e09cdad1f77..be40f181aed 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -64,8 +64,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR &); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index f00e5898d4d..cd8a8925a36 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -108,9 +108,9 @@ TAO::Any_Impl::_remove_ref (void) void TAO::Any_Impl::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL) + ) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw ::CORBA::NO_IMPLEMENT (); } CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 0e04ce527b5..71c8824e7d0 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -51,8 +51,6 @@ namespace CORBA class ValueBase; class AbstractBase; typedef AbstractBase *AbstractBase_ptr; - - class Environment; } namespace TAO @@ -89,8 +87,7 @@ namespace TAO static void _tao_any_string_destructor (void *); static void _tao_any_wstring_destructor (void *); - virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR &); virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const; virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index 4555bf32e9e..7f564c35d18 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -60,12 +60,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == 0) { @@ -119,10 +118,9 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return 0; } @@ -141,7 +139,7 @@ TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const return 0; } -template<typename T> +template<typename T> CORBA::Boolean TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const @@ -180,11 +178,11 @@ TAO::Any_Impl_T<T>::free_value (void) template<typename T> void TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index bddd912ecc9..501a85a353a 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -27,7 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { class Any; - class Environment; } namespace TAO @@ -63,7 +62,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & ACE_ENV_ARG_DECL); + virtual void _tao_decode (TAO_InputCDR & ); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index adc32568b3f..c1130d8fb92 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -49,9 +49,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any, if (bound > 0) { - ACE_DECLARE_NEW_CORBA_ENV; - CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind const kind = tc->kind (); bounded_tc = TAO::TypeCodeFactory::String_Traits<from_T>::create_typecode (kind, @@ -86,20 +84,17 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_type = any._tao_get_typecode (); CORBA::TypeCode_var unaliased_any_type = TAO::unaliased_typecode (any_type - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); CORBA::TCKind any_kind = - unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_any_type->kind (); - CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TCKind try_kind = tc->kind (); if (any_kind != try_kind) { @@ -107,8 +102,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, } CORBA::ULong length = - unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_any_type->length (); if (length != bound) { @@ -168,10 +162,9 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (tc); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return 0; } @@ -210,7 +203,7 @@ template<typename T, typename from_T, typename to_T> void TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( TAO_InputCDR &cdr - ACE_ENV_ARG_DECL + ) { if (this->value_destructor_ != 0) @@ -221,7 +214,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( if (! this->demarshal_value (cdr)) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c166c9293ca..e8dddc81b74 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -55,7 +55,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 015d7231ce5..6afaab98900 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -89,12 +89,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, { _tao_elem = 0; - ACE_TRY_NEW_ENV + try { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (_tao_equiv == false) { @@ -147,10 +146,9 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, return true; } } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return 0; } @@ -176,34 +174,30 @@ TAO::Any_SystemException::value (void) const CORBA::Boolean TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_encode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } CORBA::Boolean TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 5b2e0257e79..c616ad4a139 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -32,15 +32,13 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type ( : TAO::Any_Impl (0, tc, true) , cdr_ (static_cast<ACE_Message_Block*>(0), lock_i ()) { - ACE_TRY_NEW_ENV + try { - this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_tao_decode (cdr); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; } TAO::Unknown_IDL_Type::Unknown_IDL_Type ( @@ -58,7 +56,7 @@ TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void) CORBA::Boolean TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) { - ACE_TRY_NEW_ENV + try { // We don't want the rd_ptr to move, in case we are shared by // another Any, so we use this to copy the state, not the buffer. @@ -68,19 +66,17 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) TAO_Marshal_Object::perform_append (this->type_, &for_reading, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); if (status != TAO::TRAVERSE_CONTINUE) { return false; } } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } @@ -110,7 +106,7 @@ TAO::Unknown_IDL_Type::_tao_byte_order (void) const } void TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) + ) { // @@ (JP) The following code depends on the fact that // TAO_InputCDR does not contain chained message blocks, @@ -124,12 +120,11 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr TAO::traverse_status status = TAO_Marshal_Object::perform_skip (this->type_, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); if (status != TAO::TRAVERSE_CONTINUE) { - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } // This will be the end of the new message block. @@ -174,22 +169,19 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr CORBA::Boolean TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const { - ACE_TRY_NEW_ENV + try { CORBA::ULong kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->type_->kind (); CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_); while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tcvar = tcvar->content_type (); - kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + kind = tcvar->kind (); } if (kind != CORBA::tk_objref) @@ -200,13 +192,12 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const // We don't want the rd_ptr to move, in case we are shared by // another Any, so we use this to copy the state, not the buffer. TAO_InputCDR for_reading (this->cdr_); - + return for_reading >> obj; } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -214,22 +205,19 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const CORBA::Boolean TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const { - ACE_TRY_NEW_ENV + try { CORBA::ULong kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->type_->kind (); CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_); while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tcvar = tcvar->content_type (); - kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + kind = tcvar->kind (); } if (kind != CORBA::tk_value) @@ -253,10 +241,9 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter(); return adapter->stream_to_value (this->cdr_, val); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -264,22 +251,19 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const CORBA::Boolean TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const { - ACE_TRY_NEW_ENV + try { CORBA::ULong kind = - this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->type_->kind (); CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_); while (kind == CORBA::tk_alias) { - tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tcvar = tcvar->content_type (); - kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + kind = tcvar->kind (); } if (kind != CORBA::tk_value) @@ -304,10 +288,9 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const return adapter->stream_to_abstract_base (this->cdr_, obj); } - ACE_CATCH (CORBA::Exception, ex) + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index 063fb77aeba..af1385ee255 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -54,7 +54,7 @@ namespace TAO virtual int _tao_byte_order (void) const; virtual void _tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL); + ); virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const; virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 9c77532c4e3..4660b359253 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -41,7 +41,7 @@ TAO::TypeCode::Empty_Param::tao_release (void) CORBA::Boolean TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -51,7 +51,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr CORBA::Boolean TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // We could refactor this code to the CORBA::TypeCode::equivalent() // method but doing so would force us to determine the unaliased @@ -61,8 +61,7 @@ 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); + ); if (tc_kind != this->kind_) return false; @@ -72,7 +71,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc CORBA::TypeCode_ptr TAO::TypeCode::Empty_Param::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since parameter list is empty. diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index 62b9936a1a9..4887b9d5b63 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -78,12 +78,9 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; }; diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index b84a50f9b72..a1030c33e3c 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -82,15 +82,14 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -102,8 +101,7 @@ TAO::TypeCode::Enum<StringType, char const * const lhs_name = Traits<StringType>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -118,14 +116,13 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -138,7 +135,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -170,13 +167,13 @@ TAO::TypeCode::Enum<StringType, "" /* empty name */, tc_enumerators, this->nenumerators_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -186,7 +183,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i ( template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -198,7 +195,7 @@ CORBA::ULong TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nenumerators_; } @@ -209,7 +206,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 64a4d7bf9b0..13020e87c38 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -80,17 +80,13 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; + virtual char const * member_name_i (CORBA::ULong index) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 64cd8f00d37..e4879dad9cc 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -79,15 +79,14 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -99,8 +98,7 @@ TAO::TypeCode::Enum<char const *, char const * const lhs_name = Traits<char const *>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -114,14 +112,13 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -133,7 +130,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -165,14 +162,14 @@ TAO::TypeCode::Enum<char const *, "" /* empty name */, tc_enumerators, this->nenumerators_ - ACE_ENV_ARG_PARAMETER); + ); } char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -183,7 +180,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -194,7 +191,7 @@ CORBA::ULong TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nenumerators_; } @@ -204,7 +201,7 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index d9f22d44271..91fba95c276 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -85,17 +85,13 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; + virtual char const * member_name_i (CORBA::ULong index) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index a38566ee6b7..1b1f7645411 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -38,18 +38,16 @@ namespace TAO CORBA::Boolean Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_encode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } @@ -58,18 +56,16 @@ namespace TAO CORBA::Boolean Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr) { - ACE_TRY_NEW_ENV + try { this->value_->_tao_decode (cdr - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); return true; } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { } - ACE_ENDTRY; return false; } diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 44f6cd6834c..2b735a03bd7 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -26,11 +26,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // This is used in the implementation of the _raise methods -#if defined (TAO_HAS_EXCEPTIONS) #define TAO_RAISE(EXCEPTION) throw EXCEPTION -#else -#define TAO_RAISE(EXCEPTION) -#endif /* ACE_HAS_EXCEPTIONS */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Exception.h" diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index 0fae62d507c..04880329ccf 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -43,17 +43,15 @@ TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void) template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. CORBA::UShort const tc_digits = - tc->fixed_digits (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->fixed_digits (); CORBA::UShort const tc_scale = - tc->fixed_scale (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->fixed_scale (); return (this->digits_ == tc_digits && this->scale_ == tc_scale); @@ -62,19 +60,19 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Since TCKind comparisons must be performed before equal_i() is // called, we can also call it to determine equivalence of // tk_fixed TypeCodes. return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } template <class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_fixed TypeCodes have no name or member // names, meaning that we can simply call _duplicate() on this @@ -95,7 +93,7 @@ TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i ( template <class RefCountPolicy> CORBA::UShort TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->digits_; } @@ -103,7 +101,7 @@ TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i ( template <class RefCountPolicy> CORBA::UShort TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->scale_; } diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 058b327e37e..c70c5ff0ed5 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -75,14 +75,11 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual CORBA::UShort fixed_digits_i (void) const; + virtual CORBA::UShort fixed_scale_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 2151f9753f7..2f777c06be7 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -34,10 +34,9 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void) TAO::traverse_status TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { - CORBA::ULong const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong const kind = tc->kind (); switch (kind) { @@ -68,75 +67,75 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { TAO_Marshal_Primitive marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_any: { TAO_Marshal_Any marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_TypeCode: { TAO_Marshal_TypeCode marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_Principal: { TAO_Marshal_Principal marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_objref: { TAO_Marshal_ObjRef marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_struct: { TAO_Marshal_Struct marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_union: { TAO_Marshal_Union marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_string: { TAO_Marshal_String marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_sequence: { TAO_Marshal_Sequence marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_array: { TAO_Marshal_Array marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_alias: { TAO_Marshal_Alias marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_except: { TAO_Marshal_Except marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_wstring: { TAO_Marshal_WString marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } case CORBA::tk_value_box: case CORBA::tk_value: case CORBA::tk_event: { TAO_Marshal_Value marshal; - return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER); + return marshal.skip (tc, stream); } } } @@ -145,10 +144,9 @@ TAO::traverse_status TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { - CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong kind = tc->kind (); switch (kind) { @@ -179,75 +177,75 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { TAO_Marshal_Primitive marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_any: { TAO_Marshal_Any marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_TypeCode: { TAO_Marshal_TypeCode marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_Principal: { TAO_Marshal_Principal marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_objref: { TAO_Marshal_ObjRef marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_struct: { TAO_Marshal_Struct marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_union: { TAO_Marshal_Union marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_string: { TAO_Marshal_String marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_sequence: { TAO_Marshal_Sequence marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_array: { TAO_Marshal_Array marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_alias: { TAO_Marshal_Alias marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_except: { TAO_Marshal_Except marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_wstring: { TAO_Marshal_WString marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } case CORBA::tk_value_box: case CORBA::tk_value: case CORBA::tk_event: { TAO_Marshal_Value marshal; - return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER); + return marshal.append (tc, src, dest); } } } diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 6232bc5f87d..74de6bf2185 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -33,8 +33,6 @@ namespace CORBA { class TypeCode; typedef TypeCode *TypeCode_ptr; - - class Environment; } class TAO_OutputCDR; @@ -88,26 +86,22 @@ public: /// skip entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. static TAO::traverse_status perform_skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL); + TAO_InputCDR *context); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL) = 0; + TAO_InputCDR *context) = 0; /// append entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. static TAO::traverse_status perform_append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + TAO_OutputCDR *dest); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) = 0; + TAO_OutputCDR *dest) = 0; }; /** @@ -124,14 +118,12 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL); + TAO_InputCDR *context); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + TAO_OutputCDR *dest); }; /** @@ -148,14 +140,12 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *context - ACE_ENV_ARG_DECL); + TAO_InputCDR *context); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + TAO_OutputCDR *dest); }; /** @@ -173,13 +163,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -197,13 +187,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -221,13 +211,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -245,13 +235,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -269,13 +259,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -293,13 +283,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -317,13 +307,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -341,13 +331,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -365,13 +355,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -389,13 +379,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -413,13 +403,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); }; /** @@ -437,13 +427,13 @@ public: /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *context - ACE_ENV_ARG_DECL); + ); /// append operation virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL); + ); private: CORBA::Boolean nested_processing_; diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 56528db0c81..90c42779410 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -96,23 +96,22 @@ CORBA::NVList::~NVList (void) // add an element and just initialize its flags CORBA::NamedValue_ptr CORBA::NVList::add (CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element (if necessary) return this->add_element (flags - ACE_ENV_ARG_PARAMETER); + ); } // add an element and just initialize its flags and name CORBA::NamedValue_ptr CORBA::NVList::add_item (const char *name, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -131,12 +130,11 @@ CORBA::NamedValue_ptr CORBA::NVList::add_value (const char *name, const CORBA::Any &value, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // Call the helper to allocate a NamedValue element. CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -161,13 +159,12 @@ CORBA::NVList::add_value (const char *name, CORBA::NamedValue_ptr CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -188,12 +185,11 @@ CORBA::NamedValue_ptr CORBA::NVList::add_value_consume (char * name, CORBA::Any * value, CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (nv) { @@ -216,7 +212,7 @@ CORBA::NVList::add_value_consume (char * name, //CORBA::Status void CORBA::NVList::remove (CORBA::ULong /* n */ - ACE_ENV_ARG_DECL_NOT_USED) + ) { // not implemented // @@ (ASG) - TODO @@ -225,10 +221,9 @@ CORBA::NVList::remove (CORBA::ULong /* n */ // Helper method CORBA::NamedValue_ptr CORBA::NVList::add_element (CORBA::Flags flags - ACE_ENV_ARG_DECL) + ) { - this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); + this->evaluate (); if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) @@ -243,7 +238,6 @@ CORBA::NVList::add_element (CORBA::Flags flags ACE_NEW_THROW_EX (nv, CORBA::NamedValue, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); // set the flags and enqueue in the queue nv->flags_ = flags; @@ -261,10 +255,9 @@ CORBA::NVList::add_element (CORBA::Flags flags // return the item at location n CORBA::NamedValue_ptr CORBA::NVList::item (CORBA::ULong n - ACE_ENV_ARG_DECL) + ) { - this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::NamedValue::_nil ()); + this->evaluate (); if (n >= this->max_) { @@ -282,7 +275,7 @@ void CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, int flag, bool &lazy_evaluation - ACE_ENV_ARG_DECL) + ) { // If the list is empty then using lazy evaluation is the only // choice. @@ -298,7 +291,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, { this->_tao_decode (cdr, flag - ACE_ENV_ARG_PARAMETER); + ); return; } @@ -317,7 +310,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, void CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, int flag - ACE_ENV_ARG_DECL) + ) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, @@ -368,8 +361,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, (void) TAO_Marshal_Object::perform_append (tc, this->incoming_, &cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } delete this->incoming_; @@ -402,7 +394,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, void CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag - ACE_ENV_ARG_DECL) + ) { if (TAO_debug_level > 3) { @@ -438,8 +430,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, CORBA::Any_ptr any = nv->value (); any->impl ()->_tao_decode (incoming - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } @@ -468,7 +459,7 @@ CORBA::NVList::_tao_target_alignment (void) } void -CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL) +CORBA::NVList::evaluate (void) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -482,7 +473,7 @@ CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL) this->_tao_decode (*(incoming.get ()), this->incoming_flag_ - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index d78a228726a..9b6e212c11f 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -165,44 +165,44 @@ namespace CORBA public: /// return the current number of elements in the list - ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + ULong count (void) const; /// add an element and just initialize the flags NamedValue_ptr add (Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// add an element and initialize its name and flags NamedValue_ptr add_item (const char *, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// initializes a value, name, and flags NamedValue_ptr add_value (const char *, const Any &, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// just like add_item. In addition, memory management of char * /// name is taken over by the NVList NamedValue_ptr add_item_consume (char *, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// just like add_value. In addition, the NVList controls the /// memory management of the char *name and Any *value parameter NamedValue_ptr add_value_consume (char *, Any_ptr, Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// retrieve the item at the nth location. Raises Bounds NamedValue_ptr item (ULong n - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // CORBA::Status /// remove element at index n. Raises Bounds void remove (ULong n - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); // The pseudo object static methods.. static NVList * _duplicate (NVList *); @@ -223,18 +223,18 @@ namespace CORBA void _tao_incoming_cdr (TAO_InputCDR & cdr, int flag, bool &lazy_evaluation - ACE_ENV_ARG_DECL); + ); - /// Encode the NVList into the CDR stream. <flag> masks the type of + /// Encode the NVList into the CDR stream. @a flag masks the type of /// arguments (IN, OUT or INOUT) that are to be marshaled. void _tao_encode (TAO_OutputCDR & cdr, int flag - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); - /// Decode the NVList arguments from the <cdr> stream. + /// Decode the NVList arguments from the @a cdr stream. void _tao_decode (TAO_InputCDR & cdr, int flag - ACE_ENV_ARG_DECL); + ); /** * Return the required alignment to marshal the NVList without any @@ -265,24 +265,24 @@ namespace CORBA ~NVList (void); private: - /// constructor - cannot be instantiated directly other than + /// Constructor - cannot be instantiated directly other than /// through the CORBA::ORB::create_list method NVList (void); - /// helper to increase the list size. This is used by all the add_ + /// Helper to increase the list size. This is used by all the add_ /// methods of the NVList class NamedValue_ptr add_element (Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (ACE_ENV_SINGLE_ARG_DECL); + void evaluate (void); private: - /// internal list of parameters stored as NamedValues + /// Internal list of parameters stored as NamedValues ACE_Unbounded_Queue<NamedValue_ptr> values_; - /// maximum length of list + /// Maximum length of list ULong max_; /// Reference counter. diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index e89db0e4dfb..d3fd8f93d3c 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -99,11 +99,10 @@ CORBA::NVList::NVList (void) ACE_INLINE CORBA::ULong -CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::NVList::count (void) const { (const_cast<CORBA::NVList *> (this))->evaluate ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); return this->max_; } diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 7ed8cb3d983..094c4c43d94 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -15,7 +15,7 @@ void TAO_NVList_Adapter_Impl::create_list ( CORBA::Long count, CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL) + ) { ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX); // Create an empty list @@ -26,7 +26,6 @@ TAO_NVList_Adapter_Impl::create_list ( 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; // If count is greater than 0, create a list of NamedValues. if (count != 0) @@ -43,7 +42,6 @@ TAO_NVList_Adapter_Impl::create_list ( 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; new_list->values_.enqueue_tail (nv); } @@ -53,7 +51,7 @@ TAO_NVList_Adapter_Impl::create_list ( void TAO_NVList_Adapter_Impl::create_named_value ( CORBA::NamedValue_ptr &nv - ACE_ENV_ARG_DECL) + ) { ACE_NEW_THROW_EX (nv, CORBA::NamedValue, diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index e24ebd357c5..0eea676bc2c 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -36,11 +36,11 @@ public: virtual void create_list ( CORBA::Long count, CORBA::NVList_ptr &new_list - ACE_ENV_ARG_DECL); + ); virtual void create_named_value ( CORBA::NamedValue_ptr &nv - ACE_ENV_ARG_DECL); + ); /// Used to force the initialization of the NVList adapter static int Initializer (void); diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index c897143e4dc..33ff55b2fff 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -56,7 +56,7 @@ template <typename StringType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr /* tc */ - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -68,7 +68,7 @@ template <typename StringType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -80,7 +80,7 @@ template <typename StringType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Objref<StringType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -97,45 +97,45 @@ TAO::TypeCode::Objref<StringType, { return adapter->create_abstract_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_component) { return adapter->create_component_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_home) { return adapter->create_home_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_local_interface) { return adapter->create_local_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_native) { return adapter->create_native_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else // CORBA::tk_objref { return adapter->create_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } } template <typename StringType, class RefCountPolicy> char const * TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -145,7 +145,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i ( template <typename StringType, class RefCountPolicy> char const * TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 8444669513a..5fe946cf468 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -88,13 +88,13 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; protected: diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 883b13ab3ed..e202799ce7a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -56,7 +56,7 @@ TAO::TypeCode::Objref<char const *, CORBA::Boolean TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr /* tc */ - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -67,7 +67,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::Boolean TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr - ACE_ENV_ARG_DECL_NOT_USED) const + ) const { // Equivalence already verified in the base class // CORBA::TypeCode::equivalent() method. @@ -78,7 +78,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -95,44 +95,44 @@ TAO::TypeCode::Objref<char const *, { return adapter->create_abstract_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_component) { return adapter->create_component_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_home) { return adapter->create_home_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_local_interface) { return adapter->create_local_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else if (this->kind_ == CORBA::tk_native) { return adapter->create_native_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } else // CORBA::tk_objref { return adapter->create_interface_tc (this->attributes_.id (), "" /* empty name */ - ACE_ENV_ARG_PARAMETER); + ); } } char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -141,7 +141,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index f67bb980e66..e73dc34911c 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -91,14 +91,11 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; protected: diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 9d49724bc2f..9b177c88bca 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -192,16 +192,14 @@ namespace TAO return false; } - ACE_TRY_NEW_ENV + try { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->value_->_tao_decode (cdr); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } @@ -280,16 +278,14 @@ namespace TAO return false; } - ACE_TRY_NEW_ENV + try { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->value_->_tao_decode (cdr); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp index be526f4b094..e35d3bad781 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp @@ -58,7 +58,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, TypeCodeType, MemberArrayType>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, @@ -77,7 +77,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, Reset flag (this->in_recursion_); return this->TypeCodeBase::equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } // Nothing else to do. @@ -90,7 +90,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, TypeCodeType, MemberArrayType>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, @@ -109,7 +109,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, Reset flag (this->in_recursion_); return this->TypeCodeBase::equivalent_i (tc - ACE_ENV_ARG_PARAMETER); + ); } // Nothing else to do. diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 027100bb476..a1ad3a2f0db 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -122,9 +122,9 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; //@} diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index 76016fe93fe..16d63027525 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -63,54 +63,50 @@ template <typename TypeCodeType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<TypeCodeType>::get_typecode (this->content_type_)->equal ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } template <typename TypeCodeType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<TypeCodeType>::get_typecode (this->content_type_)->equivalent ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -130,7 +126,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i ( template <typename TypeCodeType, class RefCountPolicy> CORBA::ULong TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } @@ -138,7 +134,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i ( template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 3b8cd242ade..524f468e748 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -85,14 +85,14 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; virtual CORBA::TypeCode_ptr content_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; private: diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 874fe38365b..ab5af126c49 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -64,54 +64,50 @@ CORBA::Boolean TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following calls won't throw since CORBA::TypeCode::equal() // has already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); if (this->length_ != tc_length) return 0; CORBA::TypeCode_var rhs_content_type = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + tc->content_type (); return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent ( rhs_content_type.in () - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -132,7 +128,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::ULong TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } @@ -140,7 +136,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 7c3d4746fbc..717fc4ab013 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -83,14 +83,14 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; virtual CORBA::TypeCode_ptr content_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; private: diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index bae404af34e..7f1502b17db 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -43,12 +43,11 @@ TAO::TypeCode::String<RefCountPolicy>::tao_release (void) template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); return (this->length_ == tc_length); } @@ -56,19 +55,19 @@ TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc template <class RefCountPolicy> CORBA::Boolean TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Since TCKind comparisons must be performed before equal_i() is // called, we can also call it to determine equivalence of // tk_string-based TypeCodes. return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } template <class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -83,7 +82,7 @@ TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i ( template <class RefCountPolicy> CORBA::ULong TAO::TypeCode::String<RefCountPolicy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 86a7270f12b..362cfbb53fa 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -77,12 +77,12 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 2066078627a..1fdaf50c6d8 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -42,12 +42,11 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void) CORBA::Boolean TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. - CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::ULong const tc_length = tc->length (); return (this->length_ == tc_length); } @@ -55,18 +54,18 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i ( CORBA::Boolean TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Since TCKind comparisons must be performed before equal_i() is // called, we can also call it to determine equivalence of // tk_string-based TypeCodes. return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -80,7 +79,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( CORBA::ULong TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 8911843a9ee..bc7419e1382 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -80,12 +80,12 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::ULong length_i (void) const; private: diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index aa50e7bdf78..ba7d3ad20a4 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -113,15 +113,14 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -134,8 +133,7 @@ TAO::TypeCode::Struct<StringType, 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); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -144,13 +142,11 @@ TAO::TypeCode::Struct<StringType, 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); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -169,14 +165,13 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // 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); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -187,13 +182,11 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (this->fields_[i].type); CORBA::TypeCode_var const rhs = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equiv_members = lhs->equivalent (rhs.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_members) return false; @@ -211,7 +204,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -233,8 +226,7 @@ TAO::TypeCode::Struct<StringType, tc_fields[i].type = Traits<StringType>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); } } @@ -254,7 +246,7 @@ TAO::TypeCode::Struct<StringType, "" /* empty name */, tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, @@ -266,7 +258,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -282,7 +274,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -298,7 +290,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -313,7 +305,7 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -333,7 +325,7 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index df44f2d2a3a..3881586b117 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -92,18 +92,18 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 57e6be6de4e..2b899defcbd 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -107,15 +107,14 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -128,8 +127,7 @@ TAO::TypeCode::Struct<char const *, 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); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -138,13 +136,11 @@ TAO::TypeCode::Struct<char const *, 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); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -160,14 +156,13 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // 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); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -178,13 +173,11 @@ TAO::TypeCode::Struct<char const *, Traits<char const *>::get_typecode (this->fields_[i].type); CORBA::TypeCode_var const rhs = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equiv_members = lhs->equivalent (rhs.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_members) return false; @@ -199,7 +192,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -221,8 +214,7 @@ TAO::TypeCode::Struct<char const *, tc_fields[i].type = Traits<char const *>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); } } @@ -242,7 +234,7 @@ TAO::TypeCode::Struct<char const *, "" /* empty name */, tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } char const * @@ -251,7 +243,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -264,7 +256,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -277,7 +269,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -289,7 +281,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -306,7 +298,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index dea9405238b..4a627573908 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -96,18 +96,18 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 5abd467b23c..b2b4f0d92ec 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -32,7 +32,7 @@ CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const CORBA::Boolean CORBA::TypeCode::equal (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { if (this == tc) { @@ -45,49 +45,42 @@ CORBA::TypeCode::equal (TypeCode_ptr tc false); } - CORBA::TCKind const tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::TCKind const tc_kind = tc->kind (); if (tc_kind != this->kind_) return 0; - ACE_TRY + try { - char const * const tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const tc_id = tc->id (); - char const * const this_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const this_id = this->id (); if (ACE_OS::strcmp (this_id, tc_id) != 0) return 0; - char const * const tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const tc_name = tc->name (); - char const * const this_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + char const * const this_name = this->name (); if (ACE_OS::strcmp (this_name, tc_name) != 0) return 0; } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch ( ::CORBA::TypeCode::BadKind&) { // Some TypeCodes do not support the id() and name() // operations. Ignore the failure, and continue equality // verification using TypeCode subclass-specific techniques // below. } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); + ); } CORBA::Boolean CORBA::TypeCode::equivalent (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { if (this == tc) { @@ -105,89 +98,81 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc CORBA::TypeCode_var unaliased_this = TAO::unaliased_typecode (mutable_this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::TypeCode_var unaliased_tc = TAO::unaliased_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::TCKind const this_kind = - unaliased_this->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_this->kind (); CORBA::TCKind const tc_kind = - unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + unaliased_tc->kind (); if (tc_kind != this_kind) return false; - ACE_TRY + try { char const * const this_id = - unaliased_this->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_this->id (); char const * const tc_id = - unaliased_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + unaliased_tc->id (); if (ACE_OS::strlen (this_id) == 0 || ACE_OS::strlen (tc_id) == 0) { return unaliased_this->equivalent_i (unaliased_tc.in () - ACE_ENV_ARG_PARAMETER); + ); } else if (ACE_OS::strcmp (this_id, tc_id) != 0) { return false; } } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch ( ::CORBA::TypeCode::BadKind&) { // Some TypeCodes do not support the id() operation. Ignore the // failure, and continue equivalence verification using TypeCode // subclass-specific techniques. return unaliased_this->equivalent_i (unaliased_tc.in () - ACE_ENV_ARG_PARAMETER); + ); } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); return true; } char const * -CORBA::TypeCode::id_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::id_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } char const * -CORBA::TypeCode::name_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::name_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::ULong -CORBA::TypeCode::member_count_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::member_count_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } char const * CORBA::TypeCode::member_name_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::TypeCode_ptr CORBA::TypeCode::member_type_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); @@ -195,66 +180,66 @@ CORBA::TypeCode::member_type_i (CORBA::ULong /* index */ CORBA::Any * CORBA::TypeCode::member_label_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::discriminator_type_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); } CORBA::Long -CORBA::TypeCode::default_index_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::default_index_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::ULong -CORBA::TypeCode::length_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::length_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::TypeCode_ptr -CORBA::TypeCode::content_type_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::content_type_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); } CORBA::UShort -CORBA::TypeCode::fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_digits_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::UShort -CORBA::TypeCode::fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_scale_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); } CORBA::Visibility CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const + ) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::PRIVATE_MEMBER); } CORBA::ValueModifier -CORBA::TypeCode::type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::type_modifier_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::VM_NONE); } CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::concrete_base_type_i (void) const { ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), CORBA::TypeCode::_nil ()); @@ -300,19 +285,19 @@ CORBA::TypeCode::Bounds::_raise (void) const void CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const + ) const { if (cdr << this->_rep_id ()) { return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } @@ -348,19 +333,19 @@ CORBA::TypeCode::BadKind::_raise (void) const void CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const + ) const { if (cdr << this->_rep_id ()) { return; } - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } void CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED) + ) { } @@ -406,7 +391,7 @@ operator<< (TAO_OutputCDR & cdr, CORBA::TypeCode_ptr TAO::unaliased_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { if (CORBA::is_nil (tc)) { @@ -415,8 +400,7 @@ TAO::unaliased_typecode (CORBA::TypeCode_ptr tc tc); } - CORBA::TCKind tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + CORBA::TCKind tc_kind = tc->kind (); if (tc_kind == CORBA::tk_alias) { @@ -427,11 +411,9 @@ TAO::unaliased_typecode (CORBA::TypeCode_ptr tc do { tc_content = - tc_content->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + tc_content->content_type (); - tc_kind = tc_content->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); + tc_kind = tc_content->kind (); } while (tc_kind == CORBA::tk_alias); @@ -477,7 +459,7 @@ namespace TAO { CORBA::TypeCode::_duplicate (p); } - + void In_Object_Argument_Cloner_T<CORBA::TypeCode_ptr>::release ( CORBA::TypeCode_ptr p) @@ -490,14 +472,13 @@ namespace TAO CORBA::TCKind TAO::unaliased_kind (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var unaliased_tc = TAO::unaliased_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TAO_TC_KIND_COUNT); + ); - return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + return unaliased_tc->kind (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index 98957712997..1539fa9fed7 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -87,9 +87,9 @@ namespace CORBA virtual void _raise (void) const; virtual void _tao_encode (TAO_OutputCDR & cdr - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR & cdr - ACE_ENV_ARG_DECL); + ); }; @@ -116,9 +116,9 @@ namespace CORBA virtual void _raise (void) const; virtual void _tao_encode (TAO_OutputCDR & cdr - ACE_ENV_ARG_DECL) const; + ) const; virtual void _tao_decode (TAO_InputCDR & cdr - ACE_ENV_ARG_DECL); + ); }; @@ -160,7 +160,7 @@ namespace CORBA * @c TypeCode and @a tc returns identical results. */ Boolean equal (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; /// Equivalence of two @c TypeCodes. /** @@ -170,10 +170,10 @@ namespace CORBA * @see equal */ Boolean equivalent (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; /// The kind of @c TypeCode. - TCKind kind (ACE_ENV_SINGLE_ARG_DECL) const; + TCKind kind (void) const; /// Return @c TypeCode stripped of optional @c name and /// @c member_name fields. @@ -195,7 +195,7 @@ namespace CORBA * the TAO_IDL compiler by invoking it with its "-Gt" * (i.e. enable optimized TypeCodes) command line option. */ - TypeCode_ptr get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr get_compact_typecode (void) const; /// The @c RepositoryId globally identifying the type. /** @@ -221,7 +221,7 @@ namespace CORBA * is required by the C++ mapping. In particular, ownership * is maintained by the @c TypeCode. */ - char const * id (ACE_ENV_SINGLE_ARG_DECL) const; + char const * id (void) const; /// The simple name identifying the type within its enclosing /// scope. @@ -248,7 +248,7 @@ namespace CORBA * behavior is required by the C++ mapping. In particular, * ownership is maintained by the @c TypeCode. */ - char const * name (ACE_ENV_SINGLE_ARG_DECL) const; + char const * name (void) const; /// The type member count. /** @@ -261,7 +261,7 @@ namespace CORBA * @li @c tk_except * @li @c tk_event */ - ULong member_count (ACE_ENV_SINGLE_ARG_DECL) const; + ULong member_count (void) const; /// The type member name. /** @@ -280,7 +280,7 @@ namespace CORBA * ownership is maintained by the @c TypeCode. */ char const * member_name (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The type member @c TypeCode. /** @@ -293,7 +293,7 @@ namespace CORBA * @li @c tk_event */ TypeCode_ptr member_type (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The union member label. /** @@ -302,7 +302,7 @@ namespace CORBA * @li @c tk_union */ Any * member_label (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The type of all non-default union member labels. /** @@ -310,7 +310,7 @@ namespace CORBA * * @li @c tk_union */ - TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr discriminator_type (void) const; /// The index of the default union member. /** @@ -318,7 +318,7 @@ namespace CORBA * * @li @c tk_union */ - Long default_index (ACE_ENV_SINGLE_ARG_DECL) const; + Long default_index (void) const; /// The length of the type. /** @@ -329,7 +329,7 @@ namespace CORBA * @li @c tk_sequence * @li @c tk_array */ - ULong length (ACE_ENV_SINGLE_ARG_DECL) const; + ULong length (void) const; /// The underlying content type. /** @@ -340,7 +340,7 @@ namespace CORBA * @li @c tk_value_box * @li @c tk_alias */ - TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr content_type (void) const; /// The number of significant digits. /** @@ -348,7 +348,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const; + UShort fixed_digits (void) const; /// The scale factor. /** @@ -356,7 +356,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const; + UShort fixed_scale (void) const; /// The @c Visibility of the @c valuetype or @c eventtype member /// corresponding to index @a index. @@ -367,7 +367,7 @@ namespace CORBA * @li @c tk_event */ Visibility member_visibility (ULong index - ACE_ENV_ARG_DECL) const; + ) const; /// The @c ValueModifier of the @c valuetype of @c eventtype /// represented by this @c TypeCode. @@ -377,7 +377,7 @@ namespace CORBA * @li @c tk_value * @li @c tk_event */ - ValueModifier type_modifier (ACE_ENV_SINGLE_ARG_DECL) const; + ValueModifier type_modifier (void) const; /// The @c TypeCode corresponding to the concrete base /// @c valuetype or @c eventtype. @@ -391,7 +391,7 @@ namespace CORBA * @c valuetype or @c eventtype. * @c CORBA::TypeCode::_nil() if no concrete base exists. */ - TypeCode_ptr concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const; + TypeCode_ptr concrete_base_type (void) const; //@} /// Marshal the @c TypeCode @c TCKind. @@ -472,33 +472,33 @@ namespace CORBA */ //@{ virtual Boolean equal_i (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; virtual Boolean equivalent_i (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; virtual TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const = 0; + void) const = 0; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual ULong member_count_i (void) const; virtual char const * member_name_i (ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual TypeCode_ptr member_type_i (ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual Any * member_label_i (ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual Long default_index_i (void) const; + virtual ULong length_i (void) const; + virtual TypeCode_ptr content_type_i (void) const; + virtual UShort fixed_digits_i (void) const; + virtual UShort fixed_scale_i (void) const; virtual Visibility member_visibility_i (ULong index - ACE_ENV_ARG_DECL) const; - virtual ValueModifier type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const; + ) const; + virtual ValueModifier type_modifier_i (void) const; virtual TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} private: @@ -546,7 +546,7 @@ namespace TAO /// @c TypeCode. TAO_AnyTypeCode_Export CORBA::TypeCode_ptr unaliased_typecode ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); /// Return the unaliased @c TCKind of the given @c TypeCode. /** @@ -556,7 +556,7 @@ namespace TAO */ TAO_AnyTypeCode_Export CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL); + ); // --------------------------------------------------------------- diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index f06f9f5ba2d..8baaeebea97 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -43,113 +43,113 @@ CORBA::TypeCode::_nil (void) } ACE_INLINE CORBA::TCKind -CORBA::TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +CORBA::TypeCode::kind (void) const { return this->kind_; } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::get_compact_typecode (void) const { - return this->get_compact_typecode_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->get_compact_typecode_i (); } ACE_INLINE char const * -CORBA::TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::id (void) const { - return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->id_i (); } ACE_INLINE char const * -CORBA::TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::name (void) const { - return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->name_i (); } ACE_INLINE CORBA::ULong -CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::member_count (void) const { - return this->member_count_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->member_count_i (); } ACE_INLINE char const * CORBA::TypeCode::member_name (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_name_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::TypeCode_ptr CORBA::TypeCode::member_type (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_type_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::Any * CORBA::TypeCode::member_label (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_label_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::discriminator_type (void) const { - return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_i (); } ACE_INLINE CORBA::Long -CORBA::TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::default_index (void) const { - return this->default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->default_index_i (); } ACE_INLINE CORBA::ULong -CORBA::TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::length (void) const { - return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->length_i (); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::content_type (void) const { - return this->content_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->content_type_i (); } ACE_INLINE CORBA::UShort -CORBA::TypeCode::fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_digits (void) const { - return this->fixed_digits_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->fixed_digits_i (); } ACE_INLINE CORBA::UShort -CORBA::TypeCode::fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::fixed_scale (void) const { - return this->fixed_scale_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->fixed_scale_i (); } ACE_INLINE CORBA::Visibility CORBA::TypeCode::member_visibility (ULong index - ACE_ENV_ARG_DECL) const + ) const { return this->member_visibility_i (index - ACE_ENV_ARG_PARAMETER); + ); } ACE_INLINE CORBA::ValueModifier -CORBA::TypeCode::type_modifier (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::type_modifier (void) const { - return this->type_modifier_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->type_modifier_i (); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const +CORBA::TypeCode::concrete_base_type (void) const { - return this->concrete_base_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->concrete_base_type_i (); } ACE_INLINE void diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index 0c488de495a..bd489f01c77 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -482,10 +482,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, && cdr >> discriminant_type.out ())) // No need to use tc_demarshal() return false; - ACE_DECLARE_NEW_CORBA_ENV; CORBA::TCKind const discriminant_kind = - discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + discriminant_type->kind (); // Check for valid discriminant type. if (!(discriminant_kind == CORBA::tk_enum @@ -1392,9 +1390,8 @@ namespace 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! + info.id = tc->id (); + // Should never throw! info.type = tc; } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 67edee2d6b8..9cb9957d07e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -21,13 +21,12 @@ template <typename StringType, typename TypeCodeType> bool TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Check case names. char const * const lhs_name = this->name (); char const * const rhs_name = tc->member_name (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return 0; @@ -36,13 +35,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equal_members) return 0; @@ -50,7 +47,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, // Check case label. return this->equal_label (index, tc - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, typename TypeCodeType> @@ -58,7 +55,7 @@ bool TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Member names are ignore when determining equivalence. @@ -66,13 +63,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Boolean const equivalent_members = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equivalent_members) return 0; @@ -81,7 +76,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( // The label must be equal when determining equivalence, too. return this->equal_label (index, tc - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 638051bcb6a..e53539887cc 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -78,7 +78,7 @@ namespace TAO /// Return the IDL @c union case label value embedded within a /// @c CORBA::Any. - virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const = 0; + virtual CORBA::Any * label (void) const = 0; /// Get the name of the @c union case/member. char const * name (void) const; @@ -110,14 +110,14 @@ namespace TAO /// index" in the given @c TypeCode @a tc. bool equal (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; /// Check for equivalence of the @c case attributes contained by /// this class and the corresponding member attributes at index /// "@a index" in the given @c TypeCode @a tc. bool equivalent (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; protected: @@ -141,7 +141,7 @@ namespace TAO */ virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const = 0; + ) const = 0; private: diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp index acca54b701e..ecf86e30c38 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp @@ -54,11 +54,10 @@ bool TAO::TypeCode::Case_Enum_T<StringType, TypeCodeType>::equal_label (::CORBA::ULong index, ::CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::Any_var const any = tc->member_label (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); // The equality operator == below is guaranteed to be defined for // the discriminator type since an IDL union discriminator type must @@ -79,7 +78,7 @@ template <typename StringType, typename TypeCodeType> CORBA::Any * TAO::TypeCode::Case_Enum_T<StringType, - TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const + TypeCodeType>::label (void) const { TAO_OutputCDR out_cdr; @@ -89,7 +88,6 @@ TAO::TypeCode::Case_Enum_T<StringType, ACE_NEW_THROW_EX (retval, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); TAO_InputCDR in_cdr (out_cdr); TAO::Unknown_IDL_Type *unk = 0; @@ -97,7 +95,6 @@ TAO::TypeCode::Case_Enum_T<StringType, TAO::Unknown_IDL_Type (this->discriminator_tc_.in (), in_cdr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_value (retval); diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index 23886d0e1d4..5db4aef460d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -74,11 +74,11 @@ namespace TAO */ //@{ Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Any * label (void) const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index fc7533e98ae..56915ed0bf5 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -114,11 +114,10 @@ TAO::TypeCode::Case_T<DiscriminatorType, StringType, TypeCodeType>::equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::Any_var const any = tc->member_label (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); // The equality operator == below is guaranteed to be defined for // the discriminator type since an IDL union discriminator type must @@ -142,14 +141,13 @@ template <typename DiscriminatorType, CORBA::Any * TAO::TypeCode::Case_T<DiscriminatorType, StringType, - TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const + TypeCodeType>::label (void) const { CORBA::Any * value = 0; ACE_NEW_THROW_EX (value, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_value (value); diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index c0cff25b880..548199bd4ad 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -111,11 +111,11 @@ namespace TAO */ //@{ Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const; + virtual CORBA::Any * label (void) const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 892380775ba..c57a1eb8307 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -111,7 +111,7 @@ TAO::TypeCode::Union<StringType, CaseArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // These calls shouldn't throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking @@ -119,11 +119,9 @@ TAO::TypeCode::Union<StringType, // are supported. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) @@ -131,14 +129,12 @@ TAO::TypeCode::Union<StringType, // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); CORBA::Boolean const equal_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_discriminators) return false; @@ -159,8 +155,7 @@ TAO::TypeCode::Union<StringType, bool const equal_case = lhs_case.equal (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_case) return false; @@ -179,31 +174,27 @@ TAO::TypeCode::Union<StringType, CaseArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) return false; CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); CORBA::Boolean const equiv_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_discriminators) return false; @@ -224,8 +215,7 @@ TAO::TypeCode::Union<StringType, bool const equivalent_case = lhs_case.equivalent (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equivalent_case) return false; @@ -243,7 +233,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -264,8 +254,7 @@ TAO::TypeCode::Union<StringType, // tc_cases[i].name = empty_name; // tc_cases[i].type = // this->cases_[i]->type ()->get_compact_typecode ( -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); // } // } @@ -290,8 +279,7 @@ TAO::TypeCode::Union<StringType, // this->default_index_, // "", // Traits<StringType>::get_typecode (this->default_case_.type) -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); @@ -307,7 +295,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -323,7 +311,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -339,7 +327,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->ncases_; } @@ -353,7 +341,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -372,7 +360,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -390,7 +378,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -404,7 +392,6 @@ TAO::TypeCode::Union<StringType, ACE_NEW_THROW_EX (any, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_any (any); @@ -418,7 +405,7 @@ TAO::TypeCode::Union<StringType, } // Non-default cases. - return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->cases_[index]->label (); } template <typename StringType, @@ -430,7 +417,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( @@ -446,7 +433,7 @@ TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, RefCountPolicy>::default_index_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 8089aeea48f..73d520102b3 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -99,23 +99,23 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Any * member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::Long default_index_i (void) const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index b1ad9868e21..f79809e3af8 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -102,7 +102,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // These calls shouldn't throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking @@ -110,11 +110,9 @@ TAO::TypeCode::Union<char const *, // are supported. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) @@ -122,14 +120,12 @@ TAO::TypeCode::Union<char const *, // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); 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); + ); if (!equal_discriminators) return false; @@ -150,8 +146,7 @@ TAO::TypeCode::Union<char const *, bool const equal_case = lhs_case.equal (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_case) return false; @@ -167,31 +162,27 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); - CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + CORBA::Long tc_def = tc->default_index (); if (tc_count != this->ncases_ || tc_def != this->default_index_) return false; CORBA::TypeCode_var tc_discriminator = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->discriminator_type (); 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); + ); if (!equiv_discriminators) return false; @@ -212,8 +203,7 @@ TAO::TypeCode::Union<char const *, bool const equivalent_case = lhs_case.equivalent (i, tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equivalent_case) return false; @@ -228,7 +218,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -249,8 +239,7 @@ TAO::TypeCode::Union<char const *, // tc_cases[i].name = empty_name; // tc_cases[i].type = // this->cases_[i]->type ()->get_compact_typecode ( -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); // } // } @@ -275,8 +264,7 @@ TAO::TypeCode::Union<char const *, // this->default_index_, // "", // Traits<char const *>::get_typecode (this->default_case_.type) -// ACE_ENV_ARG_PARAMETER); -// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// ); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -287,7 +275,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -300,7 +288,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -313,7 +301,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->ncases_; } @@ -325,7 +313,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -342,7 +330,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -358,7 +346,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::member_label_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->ncases_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -372,7 +360,6 @@ TAO::TypeCode::Union<char const *, ACE_NEW_THROW_EX (any, CORBA::Any, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Any_var safe_any (any); @@ -386,7 +373,7 @@ TAO::TypeCode::Union<char const *, } // Non-default cases. - return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->cases_[index]->label (); } CORBA::TypeCode_ptr @@ -395,7 +382,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( @@ -408,7 +395,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::default_index_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index bf58345e03f..4617c259d2e 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -97,23 +97,23 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Any * member_label_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr discriminator_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual CORBA::Long default_index_i (void) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 8955d4be01b..df14b999403 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -117,34 +117,30 @@ TAO::TypeCode::Value<StringType, FieldArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // None of these calls should throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking // this method. CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_concrete_base_types) return false; CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -157,17 +153,14 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const lhs_visibility = lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (lhs_visibility != rhs_visibility) return false; 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); + Traits<StringType>::get_string (lhs_field.name); + char const * const rhs_name = tc->member_name (i); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -175,14 +168,10 @@ TAO::TypeCode::Value<StringType, 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); + tc->member_type (i); CORBA::Boolean const equal_members = - lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + lhs_tc->equal (rhs_tc.in ()); if (!equal_members) return false; @@ -201,23 +190,19 @@ TAO::TypeCode::Value<StringType, FieldArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equivalent_concrete_base_types = - this->equivalent (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->equivalent (rhs_concrete_base_type.in ()); if (!equivalent_concrete_base_types) return false; @@ -226,8 +211,7 @@ TAO::TypeCode::Value<StringType, // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -240,9 +224,7 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const lhs_visibility = lhs_field.visibility; CORBA::Visibility const rhs_visibility = - tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_visibility (i); if (lhs_visibility != rhs_visibility) return false; @@ -250,14 +232,11 @@ TAO::TypeCode::Value<StringType, 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); + tc->member_type (i); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_types) return false; @@ -274,8 +253,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + RefCountPolicy>::get_compact_typecode_i (void) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -296,8 +274,7 @@ TAO::TypeCode::Value<StringType, tc_fields[i].type = Traits<StringType>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); tc_fields[i].visibility = this->fields_[i].visibility; } } @@ -321,7 +298,7 @@ TAO::TypeCode::Value<StringType, Traits<StringType>::get_typecode (this->concrete_base_), tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, @@ -332,8 +309,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::id_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -348,8 +324,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::name_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -364,8 +339,7 @@ CORBA::ULong TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::member_count_i (void) const { return this->nfields_; } @@ -378,9 +352,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_name_i ( - CORBA::ULong index - ACE_ENV_ARG_DECL) const + RefCountPolicy>::member_name_i (CORBA::ULong index) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -398,9 +370,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_type_i ( - CORBA::ULong index - ACE_ENV_ARG_DECL) const + RefCountPolicy>::member_type_i (CORBA::ULong index) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -419,9 +389,7 @@ CORBA::Visibility TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_visibility_i ( - CORBA::ULong index - ACE_ENV_ARG_DECL) const + RefCountPolicy>::member_visibility_i (CORBA::ULong index) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -438,8 +406,7 @@ CORBA::ValueModifier TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::type_modifier_i (void) const { return this->type_modifier_; } @@ -452,8 +419,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + RefCountPolicy>::concrete_base_type_i (void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index ffc18532e6f..c2c4254fd82 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -101,24 +101,24 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::ValueModifier type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; virtual CORBA::TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index f8f661e4bdc..fd811ede635 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -108,34 +108,30 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // None of these calls should throw since CORBA::TypeCode::equal() // verified that the TCKind is the same as our's prior to invoking // this method. CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_concrete_base_types) return false; CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -148,8 +144,7 @@ TAO::TypeCode::Value<char const *, CORBA::Visibility const lhs_visibility = lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (lhs_visibility != rhs_visibility) return false; @@ -157,8 +152,7 @@ TAO::TypeCode::Value<char const *, 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); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -167,13 +161,11 @@ TAO::TypeCode::Value<char const *, 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); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -189,23 +181,20 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { CORBA::ValueModifier const tc_type_modifier = - tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->type_modifier (); if (tc_type_modifier != this->type_modifier_) return false; CORBA::TypeCode_var rhs_concrete_base_type = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->concrete_base_type (); CORBA::Boolean const equivalent_concrete_base_types = this->equivalent (rhs_concrete_base_type.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equivalent_concrete_base_types) return false; @@ -214,8 +203,7 @@ TAO::TypeCode::Value<char const *, // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -230,8 +218,7 @@ TAO::TypeCode::Value<char const *, lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (lhs_visibility != rhs_visibility) return false; @@ -240,13 +227,11 @@ TAO::TypeCode::Value<char const *, 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); + ); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_types) return false; @@ -261,7 +246,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -282,8 +267,7 @@ TAO::TypeCode::Value<char const *, tc_fields[i].type = Traits<char const *>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); tc_fields[i].visibility = this->fields_[i].visibility; } } @@ -307,7 +291,7 @@ TAO::TypeCode::Value<char const *, Traits<char const *>::get_typecode (this->concrete_base_), tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } char const * @@ -316,7 +300,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -329,7 +313,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -342,7 +326,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -354,7 +338,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -371,7 +355,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -389,7 +373,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_visibility_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), @@ -404,7 +388,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->type_modifier_; } @@ -415,7 +399,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index 57ba318ab03..6df27155314 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -98,24 +98,24 @@ namespace TAO */ //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const; - virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const; + void) const; + virtual char const * id_i (void) const; + virtual char const * name_i (void) const; + virtual CORBA::ULong member_count_i (void) const; virtual char const * member_name_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index - ACE_ENV_ARG_DECL) const; + ) const; virtual CORBA::ValueModifier type_modifier_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; virtual CORBA::TypeCode_ptr concrete_base_type_i ( - ACE_ENV_SINGLE_ARG_DECL) const; + void) const; //@} private: diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 9c6fd0a62f2..0fb04dbc451 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -78,16 +78,14 @@ namespace TAO return false; } - ACE_TRY_NEW_ENV + try { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->value_->_tao_decode (cdr); } - ACE_CATCHANY + catch ( ::CORBA::Exception&) { return false; } - ACE_ENDTRY; return true; } diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 618c273141a..0bfbd0adb7d 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -50,14 +50,13 @@ TAO::traverse_status TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; // status of encode operation - CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const k = tc->kind (); switch (k) { @@ -116,7 +115,7 @@ TAO::traverse_status TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -136,8 +135,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (elem_tc.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (retval != TAO::TRAVERSE_CONTINUE) { @@ -157,7 +155,7 @@ TAO::traverse_status TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; TAO::traverse_status retval = @@ -194,8 +192,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; @@ -207,8 +204,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; @@ -236,8 +232,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq, src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } } // end of switch } @@ -275,20 +270,20 @@ TAO::traverse_status TAO_Marshal_Principal::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // write the octet sequence representing the Principal return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq, src, dest - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; @@ -361,7 +356,7 @@ TAO::traverse_status TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -369,23 +364,20 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, // Number of fields in the struct. const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { // get member type - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -404,15 +396,13 @@ TAO::traverse_status TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->discriminator_type (); CORBA::ULong kind = - discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + discrim_tc->kind (); // Save the discriminator value in a temporary variable... CORBA::Short short_v = CORBA::Short(); @@ -495,8 +485,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U); @@ -508,16 +497,14 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ++i) { CORBA::Any_var any = tc->member_label (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->default_index (); if (i != default_index) ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -631,12 +618,11 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (default_member); return TAO_Marshal_Object::perform_append (member_tc.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ); } // If we're here, we have an implicit default case, and we @@ -647,19 +633,18 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, // If we found the member successfully then just use that one... CORBA::TypeCode_var member_tc = - tc->member_type (current_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (current_member); return TAO_Marshal_Object::perform_append (member_tc.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_String::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; @@ -688,7 +673,7 @@ TAO::traverse_status TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // Size of element. CORBA::ULong bounds; @@ -721,14 +706,12 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->content_type (); TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind kind = tc2->kind (); switch (kind) { @@ -882,8 +865,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; }// end of switch @@ -906,19 +888,16 @@ TAO::traverse_status TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong bounds = tc->length (); // get element typecode - CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TypeCode_var tc2 = tc->content_type (); // For CORBA basic types, the copy can be optimized - CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind kind = tc2->kind (); // Return status. TAO::traverse_status retval = @@ -1075,8 +1054,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; }// end of switch @@ -1097,7 +1075,7 @@ TAO::traverse_status TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -1107,14 +1085,12 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc2 = tc->content_type (); retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (retval == TAO::TRAVERSE_CONTINUE && continue_append == 1) @@ -1139,7 +1115,7 @@ TAO::traverse_status TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -1151,8 +1127,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, // Number of fields in the struct. const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count @@ -1160,14 +1135,12 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, && continue_append == 1; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE @@ -1187,7 +1160,7 @@ TAO::traverse_status TAO_Marshal_WString::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_append = 1; @@ -1217,7 +1190,7 @@ TAO::traverse_status TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -1273,19 +1246,16 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, // Handle our base valuetype if any. CORBA::TypeCode_var param = - tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->concrete_base_type (); - CORBA::TCKind const param_kind = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const param_kind = param->kind (); if (param_kind != CORBA::tk_null) { retval = this->append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (retval != TAO::TRAVERSE_CONTINUE) { @@ -1295,23 +1265,20 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, // Number of fields in the struct. const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { // get member type - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index f8c486bc6a2..6e73a6851bb 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -41,15 +41,14 @@ 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; // Status of skip operation. TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const k = tc->kind (); switch (k) { @@ -106,7 +105,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -117,13 +116,13 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, return TAO_Marshal_Object::perform_skip (elem_tc.in (), stream - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -224,7 +223,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -255,7 +254,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -317,27 +316,24 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Number of fields in the struct. CORBA::ULong const member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -355,15 +351,13 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *src - ACE_ENV_ARG_DECL) + ) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->discriminator_type (); CORBA::ULong const kind = - discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + discrim_tc->kind (); // Save the discriminator value in a temporary variable... CORBA::Short short_v = CORBA::Short(); @@ -438,8 +432,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U); @@ -450,15 +443,13 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, i < member_count && current_member == null_member; ++i) { - CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::Any_var any = tc->member_label (i); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->default_index (); if (i != default_index) ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -572,11 +563,10 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (default_member); return TAO_Marshal_Object::perform_skip (member_tc.in (), src - ACE_ENV_ARG_PARAMETER); + ); } // If we're here, we have an implicit default case, and we @@ -587,18 +577,17 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, // If we found the member successfully then just use that one... CORBA::TypeCode_var member_tc = - tc->member_type (current_member ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_type (current_member); return TAO_Marshal_Object::perform_skip (member_tc.in (), src - ACE_ENV_ARG_PARAMETER); + ); } TAO::traverse_status TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -627,7 +616,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { // Size of element. CORBA::ULong bounds; @@ -653,12 +642,10 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->content_type (); // For CORBA basic types, the skip can be optimized - CORBA::TCKind const kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const kind = tc2->kind (); char *dummy; switch (kind) @@ -713,8 +700,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, continue_skipping = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } break; }// end of switch @@ -734,22 +720,19 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::ULong bounds = tc->length (); // get element typecode // Typecode of the element. - CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TypeCode_var tc2 = tc->content_type (); // For CORBA basic types, the skip can be optimized - CORBA::TCKind const kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const kind = tc2->kind (); char *dummy; switch (kind) @@ -804,8 +787,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, int stop = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); if (stop == TAO::TRAVERSE_STOP) continue_skipping = false; } @@ -827,7 +809,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -837,13 +819,11 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc2 = tc->content_type (); retval = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); // tc2->_decr_refcnt (); if (retval == TAO::TRAVERSE_CONTINUE @@ -869,7 +849,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -881,20 +861,17 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, // Number of fields in the exception const CORBA::ULong member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -913,7 +890,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { CORBA::Boolean continue_skipping = true; @@ -943,7 +920,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream - ACE_ENV_ARG_DECL) + ) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; @@ -1028,16 +1005,13 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, } // Handle our base valuetype if any. - param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->concrete_base_type (); - CORBA::TCKind const k = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + CORBA::TCKind const k = param->kind (); if (k != CORBA::tk_null) { - retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + retval = this->skip (param.in (), stream); if (retval != TAO::TRAVERSE_CONTINUE) { @@ -1047,20 +1021,17 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, // Number of fields in the valuetype. CORBA::ULong const member_count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + tc->member_count (); for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; ++i) { - param = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + param = tc->member_type (i); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + ); } if (retval == TAO::TRAVERSE_CONTINUE) |