diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
commit | 8448cf1afd4b7667cb1451cf7fac0b864c091681 (patch) | |
tree | e7cd895a2fa466e22075c21c31fc83ebc30f476d | |
parent | d7d4b1b0c8cd2333e509eec6cc3cfd0566cbdfd7 (diff) | |
download | ATCD-8448cf1afd4b7667cb1451cf7fac0b864c091681.tar.gz |
Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
425 files changed, 1292 insertions, 5135 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 20d07daef1f..5626137c296 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/*.{h,cpp,inl}: + Removed ACE_THROW_SPEC, layout changes, reduced includes + Fri Feb 9 16:45:45 UTC 2007 Adam Mitz <mitza@ociweb.com> * MPC/config/portableserver.mpb: diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 68b5410ae0d..ad580794443 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -19,6 +19,7 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" +#include "ace/CORBA_macros.h" #if !defined(__ACE_INLINE__) #include "tao/Acceptor_Registry.inl" diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 25eb2828608..7f610091e1b 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -15,13 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/SystemException.h" +#include "tao/CORBA_methods.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index bfdf7fc5280..99d6b544ff7 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -9,6 +9,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, Adapter_Registry, diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 8dde72b3288..d6d35bbabf1 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -19,14 +19,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/CORBA_methods.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index b87c434896f..8c80bcb81d3 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -11,10 +11,10 @@ #include "tao/ORB_Core.h" #include "tao/CDR.h" #include "tao/TypeCodeFactory_Adapter.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" - ACE_RCSID (AnyTypeCode, Alias_TypeCode_Static, "$Id$") diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index ca609238294..dc252f6dada 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -8,8 +8,8 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/SystemException.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 27ff8682aa1..1b745ab3c2e 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -28,7 +28,6 @@ #include "tao/Object.h" #include "ace/CDR_Stream.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 7816b59ed9d..d4974745cca 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -11,7 +11,6 @@ #include "tao/CDR.h" #include "tao/SystemException.h" -#include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 75905a1bdb1..82b5321558c 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -7,11 +7,9 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/Marshal.h" -#include "tao/Environment.h" #include "tao/SystemException.h" #include "tao/CDR.h" -#include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index a94984c507c..4777ae696b9 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -8,12 +8,10 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/CORBA_String.h" -#include "tao/Environment.h" #include "tao/SystemException.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 71c8824e7d0..8ff7ec17394 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -15,16 +15,15 @@ #define TAO_ANY_IMPL_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" - #include "tao/Basic_Types.h" -#include "tao/orbconf.h" #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index 4595132c653..cbc2c916248 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -7,11 +7,9 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/CDR.h" -#include "tao/Environment.h" -#include "tao/SystemException.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/SystemException.h" -#include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index 7eec333b18d..6e24d8cb3c7 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -6,11 +6,9 @@ #include "tao/AnyTypeCode/Any_Special_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/Marshal.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/AnyTypeCode/String_TypeCode_Traits.h" -#include "ace/CORBA_macros.h" - #if !defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index a282559dbf5..c4a1dc5a7c7 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -8,13 +8,10 @@ #include "tao/CDR.h" #include "tao/Exception.h" -#include "tao/Environment.h" #include "tao/CORBA_String.h" #include "tao/SystemException.h" #include "ace/Auto_Ptr.h" -#include "ace/CORBA_macros.h" -#include "ace/Auto_Ptr.h" ACE_RCSID (AnyTypeCode, Any_SystemException, diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 8e776817195..005de662c30 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -5,6 +5,7 @@ #include "tao/ORB_Core.h" #include "tao/CDR.h" #include "tao/TypeCodeFactory_Adapter.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index c265e25d28c..9262c68de33 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -3,7 +3,6 @@ #include "tao/AnyTypeCode/ExceptionA.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/ORB_Constants.h" #include "tao/CORBA_String.h" #include "tao/CDR.h" diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 1894457d071..0e098b07199 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -18,14 +18,14 @@ #define TAO_MARSHAL_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/Basic_Types.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 03e272abc34..5067c9fe907 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -9,13 +9,14 @@ #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Impl.h" -#include "tao/SystemException.h" #include "tao/CORBA_String.h" #include "tao/CDR.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" +#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/AnyTypeCode/NVList.inl" @@ -95,23 +96,18 @@ CORBA::NVList::~NVList (void) // add an element and just initialize its flags CORBA::NamedValue_ptr -CORBA::NVList::add (CORBA::Flags flags - ) +CORBA::NVList::add (CORBA::Flags flags) { // call the helper to allocate a NamedValue element (if necessary) - return this->add_element (flags - ); + return this->add_element (flags); } // add an element and just initialize its flags and name CORBA::NamedValue_ptr -CORBA::NVList::add_item (const char *name, - CORBA::Flags flags - ) +CORBA::NVList::add_item (const char *name, CORBA::Flags flags) { // call the helper to allocate a NamedValue element - CORBA::NamedValue_ptr nv = this->add_element (flags - ); + CORBA::NamedValue_ptr nv = this->add_element (flags); if (nv) { @@ -129,12 +125,10 @@ CORBA::NVList::add_item (const char *name, CORBA::NamedValue_ptr CORBA::NVList::add_value (const char *name, const CORBA::Any &value, - CORBA::Flags flags - ) + CORBA::Flags flags) { // Call the helper to allocate a NamedValue element. - CORBA::NamedValue_ptr nv = this->add_element (flags - ); + CORBA::NamedValue_ptr nv = this->add_element (flags); if (nv) { @@ -157,9 +151,7 @@ CORBA::NVList::add_value (const char *name, // add an element and just initialize its flags and name CORBA::NamedValue_ptr -CORBA::NVList::add_item_consume (char *name, - CORBA::Flags flags - ) +CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags) { // call the helper to allocate a NamedValue element diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 9b6e212c11f..f5cc31072ba 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -16,7 +16,8 @@ #define TAO_NVLIST_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "ace/Unbounded_Queue.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +27,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/NVList_Adapter_Impl.h" -#include "tao/Environment.h" - #include "ace/Unbounded_Queue.h" #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 094c4c43d94..76ad1e75852 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -8,14 +8,14 @@ ACE_RCSID (AnyTypeCode, #include "tao/AnyTypeCode/NVList.h" #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_NVList_Adapter_Impl::create_list ( CORBA::Long count, - CORBA::NVList_ptr &new_list - ) + CORBA::NVList_ptr &new_list) { ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX); // Create an empty list diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index f8566f5e5d0..179d6a684a9 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -9,6 +9,7 @@ #include "tao/CDR.h" #include "tao/TypeCodeFactory_Adapter.h" #include "tao/ORB_Core.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 1fdaf50c6d8..0ce4bfdf600 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -2,6 +2,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/String_TypeCode_Static.inl" @@ -41,8 +42,7 @@ 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 - ) const + CORBA::TypeCode_ptr tc) const { // The following call won't throw since CORBA::TypeCode::equal() has // already established the kind of tc is the same as our kind. @@ -59,8 +59,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i ( // 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 - ); + return this->equal_i (tc); } CORBA::TypeCode_ptr diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index e4a0b7bbdaf..f6aa45aa0fc 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -6,7 +6,7 @@ #include "tao/ORB_Core.h" #include "tao/TypeCodeFactory_Adapter.h" #include "tao/CDR.h" - +#include "tao/SystemException.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/Struct_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 3964289f260..a2b42761208 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -11,10 +11,10 @@ ACE_RCSID (AnyTypeCode, # include "tao/AnyTypeCode/TypeCode.inl" #endif /* ! __ACE_INLINE__ */ -#include "tao/SystemException.h" #include "tao/CDR.h" #include "tao/ORB_Constants.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -31,8 +31,7 @@ CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const } CORBA::Boolean -CORBA::TypeCode::equal (TypeCode_ptr tc - ) const +CORBA::TypeCode::equal (TypeCode_ptr tc) const { if (this == tc) { @@ -72,13 +71,11 @@ CORBA::TypeCode::equal (TypeCode_ptr tc // below. } - return this->equal_i (tc - ); + return this->equal_i (tc); } CORBA::Boolean -CORBA::TypeCode::equivalent (TypeCode_ptr tc - ) const +CORBA::TypeCode::equivalent (TypeCode_ptr tc) const { if (this == tc) { diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index 8baaeebea97..30182805ddc 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -#include "tao/Environment.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp index ecf86e30c38..3d8de6f4b43 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp @@ -8,7 +8,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/SystemException.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Case_Enum_T.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index 56915ed0bf5..f0b15a97221 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -7,7 +7,7 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/SystemException.h" +#include "ace/CORBA_macros.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Case_T.inl" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 8056a766231..2fce66b9143 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -10,7 +10,6 @@ # include "tao/AnyTypeCode/Union_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -#include "tao/SystemException.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Value_Ptr.h" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index cb633504100..f39a2adc451 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -3,15 +3,14 @@ #include "tao/AnyTypeCode/Union_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/SystemException.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/Union_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ -#include "tao/SystemException.h" - #include "ace/Value_Ptr.h" - +#include "ace/CORBA_macros.h" ACE_RCSID (AnyTypeCode, Union_TypeCode_Static, diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 85342d5c9da..dc6aa73d6f7 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -6,6 +6,7 @@ #include "tao/AnyTypeCode/Value_TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "tao/ORB_Core.h" #include "tao/TypeCodeFactory_Adapter.h" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index f1137bcf859..84536062264 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -6,6 +6,7 @@ #include "tao/ORB_Core.h" #include "tao/TypeCodeFactory_Adapter.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 04a56c9823b..fdf222a149b 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/OctetSeqA.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Environment.h" #include "tao/debug.h" #include "tao/Valuetype_Adapter.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index 5fb2332e3aa..d4feddf26d0 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -39,9 +39,7 @@ ACE_RCSID (AnyTypeCode, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::traverse_status -TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, - TAO_InputCDR *stream - ) +TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) { CORBA::Boolean continue_skipping = true; @@ -118,9 +116,7 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, } TAO::traverse_status -TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, - TAO_InputCDR *stream - ) +TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) { CORBA::Boolean continue_skipping = true; diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ef6c5bc5fed..33d3afea70c 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -155,8 +155,7 @@ namespace TAO class TAO_Export ARDB_Refcount_Functor { public: - void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) - ACE_THROW_SPEC (()); + void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb); }; } diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl index c63371d74a4..d44bb4f8d8d 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl @@ -9,7 +9,6 @@ namespace TAO ACE_INLINE void ARDB_Refcount_Functor::operator () ( TAO_Asynch_Reply_Dispatcher_Base *ardb) - ACE_THROW_SPEC (()) { (void) ardb->decr_refcount (); } diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index 23128844c2a..61e428234ea 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -19,7 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/TAO_Export.h" +#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -41,7 +42,7 @@ public: virtual ~TAO_BiDir_Adapter (void); virtual void load_policy_validators (TAO_Policy_Validator &validator) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index c5767f6cd40..44de918543b 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -4,6 +4,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/ORBInitializer_Registry.h" +#include "ace/CORBA_macros.h" ACE_RCSID (BiDir_GIOP, BiDirGIOP, @@ -23,8 +24,7 @@ TAO_BiDirGIOP_Loader::~TAO_BiDirGIOP_Loader (void) } int -TAO_BiDirGIOP_Loader::init (int, - ACE_TCHAR* []) +TAO_BiDirGIOP_Loader::init (int, ACE_TCHAR* []) { if (TAO_BiDirGIOP_Loader::is_activated_ == false && TAO_DEF_GIOP_MINOR >= 2) { @@ -46,8 +46,7 @@ TAO_BiDirGIOP_Loader::init (int, bidir_orb_initializer = tmp_orb_initializer; PortableInterceptor::register_orb_initializer ( - bidir_orb_initializer.in () - ); + bidir_orb_initializer.in ()); TAO_BiDirGIOP_Loader::is_activated_ = true; } @@ -67,7 +66,6 @@ TAO_BiDirGIOP_Loader::init (int, void TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Is this true? Does the GIOP protocol version matter here? if (TAO_DEF_GIOP_MINOR < 2) diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index 00cd082a9fa..b2487dfa1da 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -52,8 +52,7 @@ public: virtual int init (int argc, ACE_TCHAR* []); - virtual void load_policy_validators (TAO_Policy_Validator &validator) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void load_policy_validators (TAO_Policy_Validator &validator); /// Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index 3b062cd28ad..da17b18d452 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -6,6 +6,8 @@ #include "tao/ORB_Constants.h" +#include "ace/CORBA_macros.h" + ACE_RCSID (BiDir_GIOP, BiDir_ORBInitializer, "$Id$") @@ -14,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_BiDir_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // } void TAO_BiDir_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); } diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index 7c8c673ce4b..8a6ca7ecb98 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -39,11 +39,9 @@ class TAO_BiDir_ORBInitializer { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index c958e7f0b0b..3c4bc6e346c 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -5,6 +5,8 @@ #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/CORBA_macros.h" + ACE_RCSID (BiDir_GIOP, BiDir_PolicyFactory, "$Id$") @@ -15,8 +17,6 @@ CORBA::Policy_ptr TAO_BiDir_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { CORBA::Policy_ptr policy = CORBA::Policy::_nil (); diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index 357c59a85c1..251b618ee23 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -41,9 +41,7 @@ class TAO_BiDir_PolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); }; diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index d3b548a9347..08a37784b0e 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -6,6 +6,8 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" +#include "ace/CORBA_macros.h" + ACE_RCSID (BiDir_GIOP, BiDir_Policy_i, "$Id$") @@ -35,7 +37,6 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy CORBA::PolicyType TAO_BidirectionalPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how this minimizes the // footprint of the class. @@ -55,7 +56,6 @@ TAO_BidirectionalPolicy::clone (void) const CORBA::Policy_ptr TAO_BidirectionalPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! @@ -70,16 +70,12 @@ TAO_BidirectionalPolicy::copy (void) void TAO_BidirectionalPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } BiDirPolicy::BidirectionalPolicyValue TAO_BidirectionalPolicy::value (void) - ACE_THROW_SPEC (( - CORBA::SystemException)) -{ - return this->value_; + {return this->value_; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 718016fc381..3ff11bd42a9 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -55,17 +55,13 @@ public: virtual TAO_BidirectionalPolicy *clone (void) const; /// = The BiDir::BidirectionalPolicy methods - virtual BiDirPolicy::BidirectionalPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual BiDirPolicy::BidirectionalPolicyValue value (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/Bounded_Array_Sequence_T.h b/TAO/tao/Bounded_Array_Sequence_T.h index c5a800f2e65..14b36b92a8b 100644 --- a/TAO/tao/Bounded_Array_Sequence_T.h +++ b/TAO/tao/Bounded_Array_Sequence_T.h @@ -12,7 +12,6 @@ #include "tao/Bounded_Array_Allocation_Traits_T.h" #include "tao/Generic_Sequence_T.h" #include "tao/Array_Traits_T.h" -#include "tao/SystemException.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 5c5f1f78e9e..043f26659d6 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -6,6 +6,7 @@ #include "tao/TAOC.h" #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, Buffering_Constraint_Policy, @@ -40,7 +41,6 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff CORBA::PolicyType TAO_Buffering_Constraint_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE; } @@ -57,14 +57,12 @@ TAO_Buffering_Constraint_Policy::clone (void) const TAO::BufferingConstraint TAO_Buffering_Constraint_Policy::buffering_constraint (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->buffering_constraint_; } CORBA::Policy_ptr TAO_Buffering_Constraint_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Buffering_Constraint_Policy* servant = 0; ACE_NEW_THROW_EX (servant, @@ -76,7 +74,6 @@ TAO_Buffering_Constraint_Policy::copy (void) void TAO_Buffering_Constraint_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index c03987881ea..77f45a63438 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -56,19 +56,15 @@ public: // = The TAO::Buffering_Constraint_Policy methods - virtual TAO::BufferingConstraint buffering_constraint (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TAO::BufferingConstraint buffering_constraint (void); void get_buffering_constraint (TAO::BufferingConstraint &) const; - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 1dd62593f70..c796957da6c 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -53,7 +53,6 @@ #include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" -#include "ace/CORBA_macros.h" #include "ace/CDR_Stream.h" diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 5b9f446646e..c7052f37fc7 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -6,6 +6,7 @@ #include "tao/Transport_Connector.h" #include "tao/Protocol_Factory.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "ace/Vector_T.h" #include "ace/INET_Addr.h" #include "ace/OS_NS_string.h" @@ -46,7 +47,6 @@ CORBA::Object_ptr TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create a TAO_Stub. TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0, @@ -75,7 +75,6 @@ CORBA::Object_ptr TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior, CORBA::ORB_ptr orb ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Pass the key string as an argument to resolve_initial_references. // NameService is the default if an empty key string is supplied. @@ -96,7 +95,6 @@ CORBA::Object_ptr TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The decomposition of a corbaloc string is in Section 13.6.10. // @@ -256,7 +254,6 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, size_t prot_addr_len, ACE_CString &canonical_endpoint ) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *separator = ACE_OS::strchr (ior, ':'); diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 737d0c4c51e..f65cc3fc8fb 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -57,8 +57,7 @@ public: /// Parse the ior-string that is passed. virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); private: @@ -69,20 +68,17 @@ private: */ CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Gets the pointer to the key_string when the protocol used is RIR CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name, CORBA::ORB_ptr orb - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void make_canonical (const char *ior, size_t ior_len, ACE_CString &canonical_endpoint - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); struct parsed_endpoint { parsed_endpoint (); diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 16ef2275d05..f8970f65f53 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -37,7 +37,6 @@ CORBA::Object_ptr TAO_CORBANAME_Parser:: parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, ACE_CString &key_string) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval; TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_id (key_string.c_str ()); @@ -64,7 +63,6 @@ CORBA::Object_ptr TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index 72da515ac70..696239a07b3 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -47,15 +47,13 @@ public: // IOR_Parser.h virtual bool match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, - CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ORB_ptr orb); private: virtual CORBA::Object_ptr parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, ACE_CString &key_string - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl index 13d78a1664c..24498085725 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl @@ -2,6 +2,8 @@ // // $Id$ +#include "tao/SystemException.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index 212ccf343c9..d2f8656b11b 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -19,13 +19,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Implementation skeleton constructor TAO_CSD_POA::TAO_CSD_POA (const String &name, PortableServer::POAManager_ptr poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ) + const TAO_POA_Policy_Set &policies, + TAO_Root_POA *parent, + ACE_Lock &lock, + TAO_SYNCH_MUTEX &thread_lock, + TAO_ORB_Core &orb_core, + TAO_Object_Adapter *object_adapter) : TAO_Regular_POA (name, poa_manager, policies, @@ -33,8 +32,7 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name, lock, thread_lock, orb_core, - object_adapter - ) + object_adapter) { ACE_NEW_THROW_EX (this->sds_proxy_, TAO::CSD::Strategy_Proxy (), @@ -48,13 +46,7 @@ TAO_CSD_POA::~TAO_CSD_POA (void) delete this->sds_proxy_; } -void TAO_CSD_POA::set_csd_strategy ( - ::CSD_Framework::Strategy_ptr strategy - - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +void TAO_CSD_POA::set_csd_strategy (::CSD_Framework::Strategy_ptr strategy) { if (CORBA::is_nil (strategy)) { @@ -71,8 +63,7 @@ TAO_CSD_POA::new_POA (const String &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ) + TAO_Object_Adapter *object_adapter) { TAO_CSD_POA *poa = 0; @@ -91,7 +82,6 @@ TAO_CSD_POA::new_POA (const String &name, TAO_CSD_Strategy_Repository *repo = ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); - CSD_Framework::Strategy_var strategy = repo->find (name); if (! ::CORBA::is_nil (strategy.in ())) diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index 5174d94014a..e6ddec124cc 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -53,10 +53,7 @@ public: /// Pass the Strategy object reference to the CSD poa. virtual - void set_csd_strategy (::CSD_Framework::Strategy_ptr s) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void set_csd_strategy (::CSD_Framework::Strategy_ptr s); /// Hook - The POA has been (or is being) activated. virtual void poa_activated_hook (); diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp index 34a02b7ea84..09a00e16ddd 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp @@ -24,7 +24,6 @@ TAO::CSD::Strategy_Base::~Strategy_Base() CORBA::Boolean TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil(poa)) { diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h index 81576348520..2be8ab259fa 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h @@ -77,8 +77,7 @@ namespace TAO /// This method is invoked to "attach" this strategy object to /// the supplied POA. Returns true for success, and false for failure. - CORBA::Boolean apply_to(PortableServer::POA_ptr poa ) - ACE_THROW_SPEC((CORBA::SystemException)); + CORBA::Boolean apply_to(PortableServer::POA_ptr poa ); protected: /// Default Constructor. diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index c3b86edf0a2..95a383058f0 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -26,9 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" -#include "tao/SystemException.h" #include "tao/Invocation_Utils.h" +#include "tao/Basic_Types.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -77,34 +76,28 @@ namespace TAO //@{ /// This method implements one of the "starting" client side /// interception points. - virtual void send_request (Invocation_Base &invocation - ) = 0; + virtual void send_request (Invocation_Base &invocation) = 0; /// This method implements one of the "ending" client side /// interception point. - virtual void receive_reply (Invocation_Base &invocation - ) = 0; + virtual void receive_reply (Invocation_Base &invocation) = 0; /// This method implements one of the "ending" client side /// interception point. - virtual void receive_exception (Invocation_Base &invocation - ) = 0; + virtual void receive_exception (Invocation_Base &invocation) = 0; /// This method implements one of the "ending" client side /// interception point. - virtual void receive_other (Invocation_Base &invocation - ) = 0; + virtual void receive_other (Invocation_Base &invocation) = 0; /// Register an interceptor. virtual void add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ) = 0; + PortableInterceptor::ClientRequestInterceptor_ptr interceptor) = 0; /// Register an interceptor with policies. virtual void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ) = 0; + const CORBA::PolicyList& policies) = 0; virtual void destroy_interceptors (void) = 0; diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index b12e8f8af6f..4ccaf78f25a 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -16,6 +16,7 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" +#include "ace/CORBA_macros.h" ACE_RCSID (CodecFactory, @@ -43,13 +44,9 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void) } CORBA::OctetSeq * -TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding)) +TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data) { - this->check_type_for_encoding (data - ); + this->check_type_for_encoding (data); // ---------------------------------------------------------------- @@ -107,8 +104,6 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data CORBA::Any * TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::FormatMismatch)) { // @todo How do we check for a format mismatch so that we can throw // a IOP::Codec::FormatMismatch exception? @@ -170,8 +165,6 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data CORBA::OctetSeq * TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding)) { this->check_type_for_encoding (data ); @@ -258,9 +251,6 @@ CORBA::Any * TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::FormatMismatch, - IOP::Codec::TypeMismatch)) { // The ACE_CDR::mb_align() call can shift the rd_ptr by up // to ACE_CDR::MAX_ALIGNMENT-1 bytes. Similarly, the offset diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index 5d051df1f75..90bb723f642 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -59,32 +59,23 @@ public: /// Encode the given data, including the TypeCode, into an octet /// sequence. virtual CORBA::OctetSeq * encode (const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding)); + ); /// Extract the TypeCode and the value from the octet sequence and /// place them into an Any. virtual CORBA::Any * decode (const CORBA::OctetSeq & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::FormatMismatch)); + ); /// Encode the given data, excluding the TypeCode, into an octet /// sequence. virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding)); + ); /// Extract the value from the octet sequence, based on the given /// TypeCode, and place it into an Any. virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::FormatMismatch, - IOP::Codec::TypeMismatch)); + ); protected: diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp index 454a4e11df0..e9ce1b47003 100644 --- a/TAO/tao/CodecFactory/CodecFactory.cpp +++ b/TAO/tao/CodecFactory/CodecFactory.cpp @@ -26,7 +26,6 @@ TAO_CodecFactory_Loader::create_object ( int, ACE_TCHAR *[] ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = CORBA::Object::_nil (); ACE_NEW_RETURN (obj, diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 2c49a66f1ea..817edeb3d4f 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -39,8 +39,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index e63b609e9c8..cbfd52ccc13 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -9,6 +9,7 @@ #include "tao/ORB_Core.h" #include "tao/Codeset_Manager.h" #include "ace/Codeset_Symbols.h" +#include "ace/CORBA_macros.h" ACE_RCSID (CodecFactory_impl, CodecFactory, @@ -22,11 +23,7 @@ TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core) } IOP::Codec_ptr -TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding, - IOP::CodecFactory::UnsupportedCodeset)) +TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc) { TAO_Codeset_Translator_Base *char_trans = 0; TAO_Codeset_Translator_Base *wchar_trans = 0; @@ -69,10 +66,7 @@ TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc } IOP::Codec_ptr -TAO_CodecFactory::create_codec (const IOP::Encoding & enc - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)) +TAO_CodecFactory::create_codec (const IOP::Encoding & enc) { return this->create_codec_i (enc.major_version, enc.minor_version, @@ -89,8 +83,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, TAO_Codeset_Translator_Base * char_trans, TAO_Codeset_Translator_Base * wchar_trans ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)) { // @todo: Ideally we should have some sort of CodecFactory // registry to make it possible to add factories diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index 1aa638deb0f..2a871e4e895 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -53,16 +53,11 @@ public: /// Create a Coder/Decoder for the given type of encoding. virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)); + ); /// Create a Coder/Decoder for the given type of encoding and codesets. virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding, - IOP::CodecFactory::UnsupportedCodeset)); + ); private: /// Prevent copying through the copy constructor and the assignment @@ -75,9 +70,7 @@ private: IOP::EncodingFormat encoding_format, TAO_Codeset_Translator_Base * char_trans, TAO_Codeset_Translator_Base * wchar_trans - ) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)); + ); private: /// Pointer to the ORB Core. diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp index 38434f7ba0e..e0fb30328f5 100644 --- a/TAO/tao/Collocated_Invocation.cpp +++ b/TAO/tao/Collocated_Invocation.cpp @@ -6,6 +6,7 @@ #include "tao/Stub.h" #include "tao/operation_details.h" #include "tao/PortableInterceptor.h" +#include "tao/SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 # include "tao/PortableInterceptorC.h" diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h index 3a058663906..65f5baba850 100644 --- a/TAO/tao/Collocation_Proxy_Broker.h +++ b/TAO/tao/Collocation_Proxy_Broker.h @@ -25,7 +25,6 @@ #include "tao/Collocation_Strategy.h" #include /**/ "tao/Versioned_Namespace.h" -#include "ace/CORBA_macros.h" #include "ace/os_include/os_stddef.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index 129cfd8f7f1..30aa76ca0f5 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -24,7 +24,6 @@ #include "tao/Basic_Types.h" #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp index f6b0200bd44..06b0ff571c6 100644 --- a/TAO/tao/Compression/Base_Compressor.cpp +++ b/TAO/tao/Compression/Base_Compressor.cpp @@ -18,18 +18,12 @@ BaseCompressor::BaseCompressor ( ::Compression::CompressorFactory_ptr BaseCompressor::compressor_factory (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return ::Compression::CompressorFactory::_duplicate (compressor_factory_.in ()); } ::Compression::CompressionLevel BaseCompressor::compression_level (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return compression_level_; } diff --git a/TAO/tao/Compression/Base_Compressor.h b/TAO/tao/Compression/Base_Compressor.h index a7fb2ad5820..c250db602fa 100644 --- a/TAO/tao/Compression/Base_Compressor.h +++ b/TAO/tao/Compression/Base_Compressor.h @@ -43,29 +43,17 @@ namespace TAO const ::CORBA::OctetSeq & source, ::CORBA::OctetSeq & target ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::CompressionException - )) = 0; + = 0; virtual void decompress ( const ::CORBA::OctetSeq & source, ::CORBA::OctetSeq & target ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::CompressionException - )) = 0; - - virtual ::Compression::CompressorFactory_ptr compressor_factory (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); - - virtual ::Compression::CompressionLevel compression_level (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + = 0; + + virtual ::Compression::CompressorFactory_ptr compressor_factory (void); + + virtual ::Compression::CompressionLevel compression_level (void); protected: ::Compression::CompressionLevel compression_level_; diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp index b5ead7ee850..dc45ebfb8cb 100644 --- a/TAO/tao/Compression/Compression.cpp +++ b/TAO/tao/Compression/Compression.cpp @@ -13,7 +13,6 @@ TAO_Compression_Loader::create_object ( CORBA::ORB_ptr, int, ACE_TCHAR *[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = CORBA::Object::_nil (); ACE_NEW_RETURN (obj, diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h index 1e6036571aa..8a8851246a0 100644 --- a/TAO/tao/Compression/Compression.h +++ b/TAO/tao/Compression/Compression.h @@ -41,8 +41,7 @@ public: /// Creates a Compression Manager and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv []) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp index 033d2ca1421..26db4296551 100644 --- a/TAO/tao/Compression/Compression_Manager.cpp +++ b/TAO/tao/Compression/Compression_Manager.cpp @@ -13,7 +13,6 @@ namespace TAO void CompressionManager::register_factory ( ::Compression::CompressorFactory_ptr compressor_factory) - ACE_THROW_SPEC ((::CORBA::SystemException, ::Compression::FactoryAlreadyRegistered)) { if (!::CORBA::is_nil (compressor_factory)) { @@ -44,10 +43,6 @@ void CompressionManager::register_factory ( void CompressionManager::unregister_factory ( ::Compression::CompressorId compressor_id) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::UnknownCompressorId - )) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -76,10 +71,6 @@ CompressionManager::unregister_factory ( ::Compression::CompressorFactory_ptr CompressionManager::get_factory ( ::Compression::CompressorId compressor_id) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::UnknownCompressorId - )) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, ::Compression::CompressorFactory::_nil ()); @@ -106,10 +97,6 @@ CompressionManager::get_factory ( CompressionManager::get_compressor ( ::Compression::CompressorId compressor_id, ::Compression::CompressionLevel compression_level) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::UnknownCompressorId - )) { ::Compression::CompressorFactory_var factory = this->get_factory (compressor_id); @@ -118,7 +105,6 @@ CompressionManager::get_compressor ( ::Compression::CompressorFactorySeq * CompressionManager::get_factories (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { // todo return 0; diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h index 0351a4d89e9..342ede5f6f1 100644 --- a/TAO/tao/Compression/Compression_Manager.h +++ b/TAO/tao/Compression/Compression_Manager.h @@ -33,32 +33,19 @@ namespace TAO public virtual TAO_Local_RefCounted_Object { virtual void register_factory ( - ::Compression::CompressorFactory_ptr compressor_factory) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::FactoryAlreadyRegistered)); + ::Compression::CompressorFactory_ptr compressor_factory); virtual void unregister_factory ( - ::Compression::CompressorId compressor_id) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::UnknownCompressorId)); + ::Compression::CompressorId compressor_id); virtual ::Compression::CompressorFactory_ptr get_factory ( - ::Compression::CompressorId compressor_id) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::UnknownCompressorId)); + ::Compression::CompressorId compressor_id); virtual ::Compression::Compressor_ptr get_compressor ( ::Compression::CompressorId compressor_id, - ::Compression::CompressionLevel compression_level) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::UnknownCompressorId)); + ::Compression::CompressionLevel compression_level); - virtual ::Compression::CompressorFactorySeq * get_factories (void) - ACE_THROW_SPEC ((::CORBA::SystemException)); + virtual ::Compression::CompressorFactorySeq * get_factories (void); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp index 4a796ab8209..9288b11c68e 100644 --- a/TAO/tao/Compression/Compressor_Factory.cpp +++ b/TAO/tao/Compression/Compressor_Factory.cpp @@ -17,14 +17,12 @@ CompressorFactory::CompressorFactory (::Compression::CompressorId compressor_id) ::Compression::CompressorId CompressorFactory::compressor_id (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { return compressor_id_; } ::CORBA::ULongLong CompressorFactory::compressed_bytes (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { ::CORBA::ULongLong return_value; { @@ -36,7 +34,6 @@ CompressorFactory::compressed_bytes (void) ::CORBA::ULongLong CompressorFactory::uncompressed_bytes (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { ::CORBA::ULongLong return_value; { @@ -48,7 +45,6 @@ CompressorFactory::uncompressed_bytes (void) ::CORBA::Double CompressorFactory::average_compression (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { ::CORBA::Double return_value = 0.0; { @@ -65,7 +61,6 @@ void CompressorFactory::add_sample ( ::CORBA::ULongLong compressed_bytes, ::CORBA::ULongLong uncompressed_bytes) - ACE_THROW_SPEC ((::CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->compressed_bytes_ += compressed_bytes; diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h index a7951189868..305a417edfd 100644 --- a/TAO/tao/Compression/Compressor_Factory.h +++ b/TAO/tao/Compression/Compressor_Factory.h @@ -35,26 +35,21 @@ namespace TAO public: CompressorFactory (::Compression::CompressorId compressor_id); - virtual ::Compression::CompressorId compressor_id (void) - ACE_THROW_SPEC (( ::CORBA::SystemException)); + virtual ::Compression::CompressorId compressor_id (void); - virtual ::CORBA::ULongLong compressed_bytes (void) - ACE_THROW_SPEC ((::CORBA::SystemException)); + virtual ::CORBA::ULongLong compressed_bytes (void); - virtual ::CORBA::ULongLong uncompressed_bytes (void) - ACE_THROW_SPEC ((::CORBA::SystemException)); + virtual ::CORBA::ULongLong uncompressed_bytes (void); - virtual ::CORBA::Double average_compression (void) - ACE_THROW_SPEC ((::CORBA::SystemException)); + virtual ::CORBA::Double average_compression (void); virtual ::Compression::Compressor_ptr get_compressor ( ::Compression::CompressionLevel compression_level) - ACE_THROW_SPEC ((::CORBA::SystemException)) = 0; + = 0; virtual void add_sample ( ::CORBA::ULongLong compressed_bytes, - ::CORBA::ULongLong uncompressed_bytes) - ACE_THROW_SPEC ((::CORBA::SystemException)); + ::CORBA::ULongLong uncompressed_bytes); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp index 39c83777f7f..1f2ba5b5080 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp @@ -22,10 +22,6 @@ ZlibCompressor::compress ( const ::CORBA::OctetSeq & source, ::CORBA::OctetSeq & target ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::CompressionException - )) { ::CORBA::ULong max_length = static_cast <CORBA::ULong> (source.length () * 1.1) + 12; target.length (max_length); @@ -50,10 +46,6 @@ void ZlibCompressor::decompress ( const ::CORBA::OctetSeq & source, ::CORBA::OctetSeq & target) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::CompressionException - )) { CORBA::ULong max_length = target.length (); int const retval = uncompress (reinterpret_cast <Bytef*>(target.get_buffer ()), diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.h b/TAO/tao/Compression/zlib/ZlibCompressor.h index 3ed01b483e6..d1fe33a54f9 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor.h +++ b/TAO/tao/Compression/zlib/ZlibCompressor.h @@ -39,20 +39,12 @@ namespace TAO virtual void compress ( const ::CORBA::OctetSeq & source, ::CORBA::OctetSeq & target - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::CompressionException - )); + ); virtual void decompress ( const ::CORBA::OctetSeq & source, ::CORBA::OctetSeq & target - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::Compression::CompressionException - )); + ); }; } diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index 40a8119a1d6..0bf8bea4120 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp @@ -20,9 +20,6 @@ Zlib_CompressorFactory::Zlib_CompressorFactory (void) : Zlib_CompressorFactory::get_compressor ( ::Compression::CompressionLevel compression_level ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { // @todo, make a array based on compression level if (CORBA::is_nil (compressor_.in ())) diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h index e20251af378..ddea95f742b 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h @@ -35,10 +35,7 @@ namespace TAO virtual ::Compression::Compressor_ptr get_compressor ( ::Compression::CompressionLevel compression_level - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: ::Compression::Compressor_var compressor_; }; diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index cc333df6749..3f99720c662 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -22,7 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" #include "tao/Basic_Types.h" #include "ace/Global_Macros.h" diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 66d2564c879..f24fecdb592 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -11,7 +11,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" - ACE_RCSID (tao, DLL_Parser, "$Id$") @@ -36,7 +35,6 @@ TAO_DLL_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_DLL_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only // called if <match_prefix> returns 1. @@ -51,13 +49,12 @@ TAO_DLL_Parser::parse_string (const char *ior, if (loader == 0) { - ACE_THROW_RETURN - (CORBA::INV_OBJREF + throw + CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO), - CORBA::Object::_nil ()); + CORBA::COMPLETED_NO); } return loader->create_object (orb, 0, 0); diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h index 1598bf85a6a..fef6541c7e5 100644 --- a/TAO/tao/DLL_Parser.h +++ b/TAO/tao/DLL_Parser.h @@ -86,8 +86,7 @@ public: // IOR_Parser.h virtual bool match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, - CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ORB_ptr orb); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index 8b4565a24fb..d7b609db5b4 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -4,7 +4,7 @@ #include "tao/Stub.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" - +#include "ace/CORBA_macros.h" #include "ace/Log_Msg.h" ACE_RCSID (tao, diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index d86e97751cf..d769f788f6a 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -303,7 +303,6 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy ( CORBA::Object_ptr obj ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Collocation_Strategy strategy = TAO_ORB_Core::collocation_strategy (obj); @@ -322,7 +321,6 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch ( TAO::Collocation_Strategy strategy ) - ACE_THROW_SPEC ((CORBA::Exception)) { TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper; collocation_upcall_wrapper.upcall ( @@ -382,11 +380,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () = dynamic_cast<POA_CORBA::DomainManager_ptr> @@ -1055,7 +1049,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy ( CORBA::Object_ptr obj ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Collocation_Strategy strategy = TAO_ORB_Core::collocation_strategy (obj); @@ -1074,7 +1067,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch ( TAO::Collocation_Strategy strategy ) - ACE_THROW_SPEC ((CORBA::Exception)) { TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper; collocation_upcall_wrapper.upcall ( @@ -1134,11 +1126,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { dynamic_cast<POA_CORBA::ConstructionPolicy_ptr> (servant) diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index f8810004498..578f77dc2b1 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -139,9 +139,7 @@ namespace POA_CORBA virtual ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; static void get_domain_policy_skel ( TAO_ServerRequest & server_request, @@ -169,8 +167,7 @@ namespace POA_CORBA get_strategy ( CORBA::Object_ptr obj - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void dispatch ( @@ -182,8 +179,7 @@ namespace POA_CORBA size_t op_len, TAO::Collocation_Strategy strategy - ) - ACE_THROW_SPEC ((CORBA::Exception)); + ); static _TAO_DomainManager_Strategized_Proxy_Broker * the_TAO_DomainManager_Strategized_Proxy_Broker (void); @@ -218,10 +214,7 @@ namespace POA_CORBA TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; // @@ -306,9 +299,7 @@ namespace POA_CORBA ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; static void make_domain_manager_skel ( TAO_ServerRequest & server_request, @@ -367,8 +358,7 @@ namespace POA_CORBA get_strategy ( CORBA::Object_ptr obj - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void dispatch ( @@ -380,8 +370,7 @@ namespace POA_CORBA size_t op_len, TAO::Collocation_Strategy strategy - ) - ACE_THROW_SPEC ((CORBA::Exception)); + ); static _TAO_ConstructionPolicy_Strategized_Proxy_Broker * the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); @@ -418,18 +407,13 @@ namespace POA_CORBA int num_args ) - ACE_THROW_SPEC (( - CORBA::SystemException - ));static void + ;static void _get_policy_type ( TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_interface.cpp:2050 @@ -440,10 +424,7 @@ namespace POA_CORBA TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_interface.cpp:2050 @@ -454,10 +435,7 @@ namespace POA_CORBA TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; // diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl index ac024975dee..d65a01973ec 100644 --- a/TAO/tao/Domain/DomainS.inl +++ b/TAO/tao/Domain/DomainS.inl @@ -97,9 +97,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type ( int num_args ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type ( servant, @@ -120,9 +117,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy ( int num_args ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy ( servant, @@ -143,9 +137,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy ( int num_args ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy ( servant, diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index 02cdc148bbf..104c41a5088 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -92,10 +92,7 @@ namespace POA_CORBA ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: T *ptr_; @@ -152,30 +149,21 @@ namespace POA_CORBA CORBA::PolicyType policy_type ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Policy_ptr copy ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -184,10 +172,7 @@ namespace POA_CORBA ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: T *ptr_; diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl index 937efa3ed1a..a24aaedddda 100644 --- a/TAO/tao/Domain/DomainS_T.inl +++ b/TAO/tao/Domain/DomainS_T.inl @@ -129,9 +129,6 @@ template <class T> ACE_INLINE ::CORBA::PolicyType policy_type ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ptr_->get_domain_policy ( policy_type @@ -239,9 +236,6 @@ template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ptr_->policy_type ( @@ -255,9 +249,6 @@ template <class T> ACE_INLINE ::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ptr_->copy ( @@ -269,11 +260,7 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ConstructionPolicy_tie<T>::destroy ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->ptr_->destroy ( @@ -289,9 +276,6 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager ( ::CORBA::Boolean constr_policy ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->ptr_->make_domain_manager ( object_type, diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index c9c216b82fa..a8b9f7b0f9e 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -175,11 +175,7 @@ TAO::Collocation_Proxy_Broker * ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy ( ::CORBA::PolicyType policy_type - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (!this->is_evaluated ()) { @@ -375,11 +371,7 @@ TAO::Collocation_Proxy_Broker * void CORBA::ConstructionPolicy::make_domain_manager ( ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (!this->is_evaluated ()) { diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index d2545586694..3727ed2fd02 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -42,7 +42,6 @@ #include /**/ "tao/TAO_Export.h" #include "tao/ORB.h" -#include "tao/SystemException.h" #include "tao/Object.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" @@ -144,10 +143,7 @@ namespace CORBA virtual ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -266,10 +262,7 @@ namespace CORBA ::CORBA::InterfaceDef_ptr object_type, ::CORBA::Boolean constr_policy - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index 1cc7f626c19..497d93b86bc 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -36,10 +36,6 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void) DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any (const CORBA::Any & value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode - )) { return TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> ( @@ -49,10 +45,6 @@ TAO_DynAnyFactory::create_dyn_any (const CORBA::Any & value) DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any_from_type_code (CORBA::TypeCode_ptr type) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode - )) { // Second arg is typed in the template parameter, repeating it // this way allows cleaner template code. @@ -65,11 +57,6 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code (CORBA::TypeCode_ptr type) DynamicAny::DynAny_ptr TAO_DynAnyFactory::create_dyn_any_without_truncation ( const CORBA::Any & /* value */) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode, - DynamicAny::MustTruncate - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -78,11 +65,6 @@ DynamicAny::DynAnySeq * TAO_DynAnyFactory::create_multiple_dyn_anys ( const DynamicAny::AnySeq & /* values */, ::CORBA::Boolean /* allow_truncate */) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode, - DynamicAny::MustTruncate - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -90,9 +72,6 @@ TAO_DynAnyFactory::create_multiple_dyn_anys ( DynamicAny::AnySeq * TAO_DynAnyFactory::create_multiple_anys ( const DynamicAny::DynAnySeq & /* values */) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw ::CORBA::NO_IMPLEMENT (); } diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index e480a94162a..18338af792a 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -49,49 +49,28 @@ public: // = The DynamicAnyFactory methods. virtual DynamicAny::DynAny_ptr create_dyn_any ( const CORBA::Any & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode - )); + ); virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode - )); +; virtual DynamicAny::DynAny_ptr create_dyn_any_without_truncation ( const CORBA::Any & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode, - DynamicAny::MustTruncate - )); + ); virtual DynamicAny::DynAnySeq * create_multiple_dyn_anys ( const DynamicAny::AnySeq & values, ::CORBA::Boolean allow_truncate - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode, - DynamicAny::MustTruncate - )); + ); virtual DynamicAny::AnySeq * create_multiple_anys ( const DynamicAny::DynAnySeq & values - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// TAO-specific methods. diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp index 8892bb344ba..aa938ff4259 100644 --- a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp +++ b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp @@ -34,11 +34,6 @@ namespace TAO void DynAnyBasicTypeUtils<T>::insert_value (const T &val, TAO_DynCommon *the_dynany) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (the_dynany->destroyed ()) { @@ -64,11 +59,6 @@ namespace TAO template<typename T> typename BasicTypeTraits<T>::return_type DynAnyBasicTypeUtils<T>::get_value (TAO_DynCommon *the_dynany) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (the_dynany->destroyed ()) { @@ -102,9 +92,6 @@ namespace TAO void DynAnyFlagUtils<T>::set_flag_t (DynamicAny::DynAny_ptr component, CORBA::Boolean destroying) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { T *tmp = T::_narrow (component); diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.h b/TAO/tao/DynamicAny/DynAnyUtils_T.h index f91d18b9f25..4eef1f6d36b 100644 --- a/TAO/tao/DynamicAny/DynAnyUtils_T.h +++ b/TAO/tao/DynamicAny/DynAnyUtils_T.h @@ -38,20 +38,10 @@ namespace TAO { static void insert_value (const T &val, - TAO_DynCommon *the_dynany) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + TAO_DynCommon *the_dynany); static typename BasicTypeTraits<T>::return_type - get_value (TAO_DynCommon *the_dynany) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + get_value (TAO_DynCommon *the_dynany); }; // Encapsulates code that would otherwise be repeated in @@ -62,10 +52,7 @@ namespace TAO { static void set_flag_t (DynamicAny::DynAny_ptr component, - CORBA::Boolean destroying) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CORBA::Boolean destroying); }; // Used by MakeDynAnyUtils below, parameterized on the type of diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 30812c92ae5..ca1d281536a 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -211,11 +211,6 @@ TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref) void TAO_DynAny_i::from_any (const CORBA::Any &any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -242,7 +237,6 @@ TAO_DynAny_i::from_any (const CORBA::Any &any) CORBA::Any_ptr TAO_DynAny_i::to_any (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->destroyed_) { @@ -260,7 +254,6 @@ TAO_DynAny_i::to_any (void) CORBA::Boolean TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->destroyed_) { @@ -510,9 +503,6 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) void TAO_DynAny_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -528,10 +518,6 @@ TAO_DynAny_i::destroy (void) DynamicAny::DynAny_ptr TAO_DynAny_i::current_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index a02b03b5077..8fb87212a98 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -68,42 +68,24 @@ public: virtual void from_any ( const CORBA::Any & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::Any * to_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void destroy ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr current_component ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; private: /// Check if the typecode is acceptable. diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index 03bee2253e0..fe92067d92c 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -182,9 +182,6 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref) DynamicAny::AnySeq * TAO_DynArray_i::get_elements (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -216,11 +213,6 @@ TAO_DynArray_i::get_elements (void) void TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -263,9 +255,6 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value) DynamicAny::DynAnySeq * TAO_DynArray_i::get_elements_as_dyn_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -298,11 +287,6 @@ TAO_DynArray_i::set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & values ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -343,11 +327,6 @@ TAO_DynArray_i::set_elements_as_dyn_any ( void TAO_DynArray_i::from_any (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -418,9 +397,6 @@ TAO_DynArray_i::from_any (const CORBA::Any& any) CORBA::Any_ptr TAO_DynArray_i::to_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -480,9 +456,6 @@ TAO_DynArray_i::to_any (void) CORBA::Boolean TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -521,9 +494,6 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs) void TAO_DynArray_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -546,10 +516,6 @@ TAO_DynArray_i::destroy (void) DynamicAny::DynAny_ptr TAO_DynArray_i::current_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index 17742413936..c10f33015a8 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -66,81 +66,45 @@ public: // = Functions specific to DynArray. - virtual DynamicAny::AnySeq * get_elements ( - void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual DynamicAny::AnySeq * get_elements (void); virtual void set_elements ( const DynamicAny::AnySeq & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any ( const CORBA::Any & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::Any * to_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void destroy ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr current_component ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; private: /// Returns the type of elements contained in the array. diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 8f08b558461..163028c36ae 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -35,9 +35,6 @@ TAO_DynCommon::~TAO_DynCommon (void) CORBA::TypeCode_ptr TAO_DynCommon::type (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -49,10 +46,6 @@ TAO_DynCommon::type (void) void TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { @@ -77,110 +70,60 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any) void TAO_DynCommon::insert_boolean (CORBA::Boolean value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::insert_value (value, this); } void TAO_DynCommon::insert_octet (CORBA::Octet value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Octet>::insert_value (value, this); } void TAO_DynCommon::insert_char (CORBA::Char value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Char>::insert_value (value, this); } void TAO_DynCommon::insert_short (CORBA::Short value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Short>::insert_value (value, this); } void TAO_DynCommon::insert_ushort (CORBA::UShort value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::UShort>::insert_value (value, this); } void TAO_DynCommon::insert_long (CORBA::Long value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Long>::insert_value (value, this); } void TAO_DynCommon::insert_ulong (CORBA::ULong value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::ULong>::insert_value (value, this); } void TAO_DynCommon::insert_float (CORBA::Float value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Float>::insert_value (value, this); } void TAO_DynCommon::insert_double (CORBA::Double value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Double>::insert_value (value, this); } void TAO_DynCommon::insert_string (const char * value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -222,11 +165,6 @@ TAO_DynCommon::insert_string (const char * value) void TAO_DynCommon::insert_reference (CORBA::Object_ptr value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -301,44 +239,24 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value) void TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::TypeCode_ptr>::insert_value (value, this); } void TAO_DynCommon::insert_longlong (CORBA::LongLong value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::insert_value (value, this); } void TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::insert_value (value, this); } void TAO_DynCommon::insert_longdouble (CORBA::LongDouble value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::insert_value (value, this); @@ -346,11 +264,6 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value) void TAO_DynCommon::insert_wchar (CORBA::WChar value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::WChar>::insert_value (value, this); @@ -358,11 +271,6 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value) void TAO_DynCommon::insert_wstring (const CORBA::WChar * value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -395,11 +303,6 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value) void TAO_DynCommon::insert_any (const CORBA::Any &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::Any>::insert_value (value, this); @@ -409,11 +312,6 @@ TAO_DynCommon::insert_any (const CORBA::Any &value) // have fewer Any/DynAny conversions than insert_any, not more. void TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -427,11 +325,6 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value) void TAO_DynCommon::insert_val (CORBA::ValueBase *value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -498,110 +391,60 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value) CORBA::Boolean TAO_DynCommon::get_boolean (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::get_value (this); } CORBA::Octet TAO_DynCommon::get_octet (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Octet>::get_value (this); } CORBA::Char TAO_DynCommon::get_char (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Char>::get_value (this); } CORBA::Short TAO_DynCommon::get_short (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Short>::get_value (this); } CORBA::UShort TAO_DynCommon::get_ushort (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::UShort>::get_value (this); } CORBA::Long TAO_DynCommon::get_long (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Long>::get_value (this); } CORBA::ULong TAO_DynCommon::get_ulong (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::ULong>::get_value (this); } CORBA::Float TAO_DynCommon::get_float (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Float>::get_value (this); } CORBA::Double TAO_DynCommon::get_double (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::Double>::get_value (this); } char * TAO_DynCommon::get_string (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -646,11 +489,6 @@ TAO_DynCommon::get_string (void) CORBA::Object_ptr TAO_DynCommon::get_reference (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -679,11 +517,6 @@ TAO_DynCommon::get_reference (void) CORBA::TypeCode_ptr TAO_DynCommon::get_typecode (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -711,44 +544,24 @@ TAO_DynCommon::get_typecode (void) CORBA::LongLong TAO_DynCommon::get_longlong (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::get_value (this); } CORBA::ULongLong TAO_DynCommon::get_ulonglong (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::get_value (this); } CORBA::LongDouble TAO_DynCommon::get_longdouble (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { return TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::get_value (this); } CORBA::WChar TAO_DynCommon::get_wchar (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -776,11 +589,6 @@ TAO_DynCommon::get_wchar (void) CORBA::WChar * TAO_DynCommon::get_wstring (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -815,11 +623,6 @@ TAO_DynCommon::get_wstring (void) CORBA::Any_ptr TAO_DynCommon::get_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -854,11 +657,6 @@ TAO_DynCommon::get_any (void) // have fewer Any/DynAny conversions than get_any, not more. DynamicAny::DynAny_ptr TAO_DynCommon::get_dyn_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -875,11 +673,6 @@ TAO_DynCommon::get_dyn_any (void) CORBA::ValueBase * TAO_DynCommon::get_val (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -936,9 +729,6 @@ TAO_DynCommon::get_val (void) CORBA::Boolean TAO_DynCommon::seek (CORBA::Long slot ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -965,9 +755,6 @@ TAO_DynCommon::seek (CORBA::Long slot void TAO_DynCommon::rewind (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -979,9 +766,6 @@ TAO_DynCommon::rewind (void) CORBA::Boolean TAO_DynCommon::next (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -1004,9 +788,6 @@ TAO_DynCommon::next (void) DynamicAny::DynAny_ptr TAO_DynCommon::copy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -1025,9 +806,6 @@ TAO_DynCommon::copy (void) CORBA::ULong TAO_DynCommon::component_count (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -1041,11 +819,6 @@ TAO_DynCommon::component_count (void) void TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -1119,11 +892,6 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value) CORBA::AbstractBase_ptr TAO_DynCommon::get_abstract (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -1177,11 +945,6 @@ TAO_DynCommon::get_abstract (void) void TAO_DynCommon::insert_boolean_seq (const CORBA::BooleanSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::insert_value (value, this); @@ -1189,11 +952,6 @@ TAO_DynCommon::insert_boolean_seq (const CORBA::BooleanSeq &value) void TAO_DynCommon::insert_octet_seq (const CORBA::OctetSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::insert_value (value, this); @@ -1201,11 +959,6 @@ TAO_DynCommon::insert_octet_seq (const CORBA::OctetSeq &value) void TAO_DynCommon::insert_char_seq (const CORBA::CharSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::insert_value (value, this); @@ -1213,33 +966,18 @@ TAO_DynCommon::insert_char_seq (const CORBA::CharSeq &value) void TAO_DynCommon::insert_short_seq (const CORBA::ShortSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::insert_value (value, this); } void TAO_DynCommon::insert_ushort_seq (const CORBA::UShortSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::insert_value (value, this); } void TAO_DynCommon::insert_long_seq (const CORBA::LongSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::insert_value (value, this); @@ -1247,11 +985,6 @@ TAO_DynCommon::insert_long_seq (const CORBA::LongSeq &value) void TAO_DynCommon::insert_ulong_seq (const CORBA::ULongSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::insert_value (value, this); @@ -1259,11 +992,6 @@ TAO_DynCommon::insert_ulong_seq (const CORBA::ULongSeq &value) void TAO_DynCommon::insert_float_seq (const CORBA::FloatSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::insert_value (value, this); @@ -1271,11 +999,6 @@ TAO_DynCommon::insert_float_seq (const CORBA::FloatSeq &value) void TAO_DynCommon::insert_double_seq (const CORBA::DoubleSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::insert_value (value, this); @@ -1283,11 +1006,6 @@ TAO_DynCommon::insert_double_seq (const CORBA::DoubleSeq &value) void TAO_DynCommon::insert_longlong_seq (const CORBA::LongLongSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::insert_value (value, this); @@ -1295,11 +1013,6 @@ TAO_DynCommon::insert_longlong_seq (const CORBA::LongLongSeq &value) void TAO_DynCommon::insert_ulonglong_seq (const CORBA::ULongLongSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::insert_value (value, this); @@ -1307,11 +1020,6 @@ TAO_DynCommon::insert_ulonglong_seq (const CORBA::ULongLongSeq &value) void TAO_DynCommon::insert_longdouble_seq (const CORBA::LongDoubleSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::insert_value (value, this); @@ -1319,11 +1027,6 @@ TAO_DynCommon::insert_longdouble_seq (const CORBA::LongDoubleSeq &value) void TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::insert_value (value, this); @@ -1333,11 +1036,6 @@ TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value) CORBA::BooleanSeq * TAO_DynCommon::get_boolean_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::BooleanSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::get_value (this); @@ -1346,11 +1044,6 @@ TAO_DynCommon::get_boolean_seq (void) CORBA::OctetSeq * TAO_DynCommon::get_octet_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::OctetSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::get_value (this); @@ -1359,11 +1052,6 @@ TAO_DynCommon::get_octet_seq (void) CORBA::CharSeq * TAO_DynCommon::get_char_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::CharSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::get_value (this); @@ -1372,11 +1060,6 @@ TAO_DynCommon::get_char_seq (void) CORBA::ShortSeq * TAO_DynCommon::get_short_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::ShortSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::get_value (this); @@ -1385,11 +1068,6 @@ TAO_DynCommon::get_short_seq (void) CORBA::UShortSeq * TAO_DynCommon::get_ushort_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::UShortSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::get_value (this); @@ -1398,11 +1076,6 @@ TAO_DynCommon::get_ushort_seq (void) CORBA::LongSeq * TAO_DynCommon::get_long_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::LongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::get_value (this); @@ -1411,11 +1084,6 @@ TAO_DynCommon::get_long_seq (void) CORBA::ULongSeq * TAO_DynCommon::get_ulong_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::ULongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::get_value (this); @@ -1424,11 +1092,6 @@ TAO_DynCommon::get_ulong_seq (void) CORBA::FloatSeq * TAO_DynCommon::get_float_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::FloatSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::get_value (this); @@ -1437,11 +1100,6 @@ TAO_DynCommon::get_float_seq (void) CORBA::DoubleSeq * TAO_DynCommon::get_double_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::DoubleSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::get_value (this); @@ -1450,11 +1108,6 @@ TAO_DynCommon::get_double_seq (void) CORBA::LongLongSeq * TAO_DynCommon::get_longlong_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::LongLongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::get_value (this); @@ -1463,11 +1116,6 @@ TAO_DynCommon::get_longlong_seq (void) CORBA::ULongLongSeq * TAO_DynCommon::get_ulonglong_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::ULongLongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::get_value (this); @@ -1476,11 +1124,6 @@ TAO_DynCommon::get_ulonglong_seq (void) CORBA::LongDoubleSeq * TAO_DynCommon::get_longdouble_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::LongDoubleSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::get_value (this); @@ -1489,11 +1132,6 @@ TAO_DynCommon::get_longdouble_seq (void) CORBA::WCharSeq * TAO_DynCommon::get_wchar_seq (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::WCharSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::get_value (this); @@ -1505,9 +1143,6 @@ TAO_DynCommon::get_wchar_seq (void) void TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, CORBA::Boolean destroying) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CORBA::TypeCode_var tc = component->type (); @@ -1556,11 +1191,6 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, DynamicAny::DynAny_ptr TAO_DynCommon::check_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->current_position_ == -1) { @@ -1601,10 +1231,6 @@ TAO_DynCommon::check_component (void) void TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { CORBA::Boolean const equivalent = this->type_->equivalent (tc); @@ -1666,10 +1292,6 @@ TAO_DynCommon::ref_to_component (CORBA::Boolean val) CORBA::TypeCode_ptr TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { this->check_type (tc); diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index a4093d39233..da687a20953 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -42,627 +42,265 @@ public: // = Some functions common to all Dynamic Any types. virtual CORBA::TypeCode_ptr type ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual void assign ( DynamicAny::DynAny_ptr dyn_any - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); + ); virtual void insert_boolean ( CORBA::Boolean value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_octet ( CORBA::Octet value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_char ( CORBA::Char value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_short ( CORBA::Short value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual void insert_ushort ( CORBA::UShort value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual void insert_long ( CORBA::Long value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_ulong ( CORBA::ULong value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_float ( CORBA::Float value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_double ( CORBA::Double value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_string ( const char * value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_reference ( CORBA::Object_ptr value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_typecode ( CORBA::TypeCode_ptr value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_longlong ( CORBA::LongLong value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_ulonglong ( CORBA::ULongLong value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_longdouble ( CORBA::LongDouble value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_wchar ( CORBA::WChar value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_wstring ( const CORBA::WChar * value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_any ( const CORBA::Any & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_dyn_any ( DynamicAny::DynAny_ptr value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_val ( CORBA::ValueBase * value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual CORBA::Boolean get_boolean ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Octet get_octet ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Char get_char ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Short get_short ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::UShort get_ushort ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Long get_long ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::ULong get_ulong ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Float get_float ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Double get_double ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual char * get_string ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Object_ptr get_reference ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::TypeCode_ptr get_typecode ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::LongLong get_longlong ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::ULongLong get_ulonglong ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::LongDouble get_longdouble ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::WChar get_wchar ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::WChar * get_wstring ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Any * get_any ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual DynamicAny::DynAny_ptr get_dyn_any ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::ValueBase * get_val ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::Boolean seek ( CORBA::Long index - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void rewind ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual CORBA::Boolean next ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual DynamicAny::DynAny_ptr copy ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual CORBA::ULong component_count ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual void insert_abstract ( CORBA::AbstractBase_ptr value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual CORBA::AbstractBase_ptr get_abstract ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual void insert_boolean_seq ( const CORBA::BooleanSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_octet_seq ( const CORBA::OctetSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_char_seq ( const CORBA::CharSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_short_seq ( const CORBA::ShortSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_ushort_seq ( const CORBA::UShortSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_long_seq ( const CORBA::LongSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_ulong_seq ( const CORBA::ULongSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_float_seq ( const CORBA::FloatSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_double_seq ( const CORBA::DoubleSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_longlong_seq ( const CORBA::LongLongSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_ulonglong_seq ( const CORBA::ULongLongSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_longdouble_seq ( const CORBA::LongDoubleSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void insert_wchar_seq ( const CORBA::WCharSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual CORBA::BooleanSeq * get_boolean_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::OctetSeq * get_octet_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::CharSeq * get_char_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::ShortSeq * get_short_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::UShortSeq * get_ushort_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::LongSeq * get_long_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::ULongSeq * get_ulong_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::FloatSeq * get_float_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::DoubleSeq * get_double_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::LongLongSeq * get_longlong_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::ULongLongSeq * get_ulonglong_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::LongDoubleSeq * get_longdouble_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::WCharSeq * get_wchar_seq ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); /// This sets one of two flags in this base class. CORBA 2.4.2 /// requires that destroy() do nothing if it is called on @@ -677,26 +315,14 @@ public: DynamicAny::DynAny_ptr component, CORBA::Boolean destroying - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // Utility functions. - DynamicAny::DynAny_ptr check_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + DynamicAny::DynAny_ptr check_component (void); void check_type (CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); + ); static bool is_basic_type_seq (CORBA::TypeCode_ptr tc); @@ -741,11 +367,7 @@ private: // Utility functions used by insert_* and get_*. CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index 289d9c3a1cd..0650f58ead1 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -104,7 +104,6 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref) char * TAO_DynEnum_i::get_as_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *retval = this->type_.in ()->member_name (this->value_); @@ -113,10 +112,6 @@ TAO_DynEnum_i::get_as_string (void) void TAO_DynEnum_i::set_as_string (const char *value_as_string) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { CORBA::ULong count = this->type_.in ()->member_count (); @@ -145,19 +140,12 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string) CORBA::ULong TAO_DynEnum_i::get_as_ulong (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->value_; } void TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { CORBA::ULong const max = this->type_.in ()->member_count (); @@ -175,11 +163,6 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong) void TAO_DynEnum_i::from_any (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()); @@ -215,9 +198,6 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any) CORBA::Any_ptr TAO_DynEnum_i::to_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_OutputCDR out_cdr; @@ -241,9 +221,6 @@ TAO_DynEnum_i::to_any (void) CORBA::Boolean TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CORBA::TypeCode_var tc = rhs->type (); @@ -282,9 +259,6 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs) void TAO_DynEnum_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -299,10 +273,6 @@ TAO_DynEnum_i::destroy (void) DynamicAny::DynAny_ptr TAO_DynEnum_i::current_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index 506844d4543..15cbc510818 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -68,77 +68,45 @@ public: virtual char * get_as_string ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_as_string ( const char * value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::ULong get_as_ulong ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_as_ulong ( CORBA::ULong value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); +; // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any ( const CORBA::Any & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::Any * to_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void destroy ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr current_component ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; private: // Called by both versions of init(). diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 2174717cc67..c2e5b7be2c3 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -160,9 +160,6 @@ TAO_DynSequence_i::get_element_type (void) CORBA::ULong TAO_DynSequence_i::get_length (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -174,10 +171,6 @@ TAO_DynSequence_i::get_length (void) void TAO_DynSequence_i::set_length (CORBA::ULong length) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -252,9 +245,6 @@ TAO_DynSequence_i::set_length (CORBA::ULong length) DynamicAny::AnySeq * TAO_DynSequence_i::get_elements (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -286,11 +276,6 @@ TAO_DynSequence_i::get_elements (void) void TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -372,9 +357,6 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value) DynamicAny::DynAnySeq * TAO_DynSequence_i::get_elements_as_dyn_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -405,11 +387,6 @@ TAO_DynSequence_i::get_elements_as_dyn_any (void) void TAO_DynSequence_i::set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & values) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -482,11 +459,6 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( void TAO_DynSequence_i::from_any (const CORBA::Any & any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -583,9 +555,6 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any) CORBA::Any_ptr TAO_DynSequence_i::to_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -646,9 +615,6 @@ TAO_DynSequence_i::to_any (void) CORBA::Boolean TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -692,9 +658,6 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs) void TAO_DynSequence_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -717,10 +680,6 @@ TAO_DynSequence_i::destroy (void) DynamicAny::DynAny_ptr TAO_DynSequence_i::current_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index 440dd3b3c33..d11675bd240 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -68,53 +68,30 @@ public: virtual CORBA::ULong get_length ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_length ( CORBA::ULong len ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); +; virtual DynamicAny::AnySeq * get_elements ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_elements ( const DynamicAny::AnySeq & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; // = DynAny common functions not implemented in class TAO_DynCommon. @@ -122,42 +99,24 @@ public: virtual void from_any ( const CORBA::Any & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::Any * to_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void destroy ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr current_component ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; private: // Utility, turns the type of elements contained in the sequence. diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index 747f5320ac2..b93b6a78cbf 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -187,11 +187,6 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref) DynamicAny::FieldName TAO_DynStruct_i::current_member_name (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -223,11 +218,6 @@ TAO_DynStruct_i::current_member_name (void) // Returns the unaliased TCKind. CORBA::TCKind TAO_DynStruct_i::current_member_kind (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -261,9 +251,6 @@ TAO_DynStruct_i::current_member_kind (void) DynamicAny::NameValuePairSeq * TAO_DynStruct_i::get_members (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -313,11 +300,6 @@ TAO_DynStruct_i::get_members (void) void TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -370,9 +352,6 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values) DynamicAny::NameDynAnyPairSeq * TAO_DynStruct_i::get_members_as_dyn_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -419,11 +398,6 @@ TAO_DynStruct_i::set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & values ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -476,11 +450,6 @@ TAO_DynStruct_i::set_members_as_dyn_any ( void TAO_DynStruct_i::from_any (const CORBA::Any & any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -565,9 +534,6 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any) CORBA::Any_ptr TAO_DynStruct_i::to_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -640,9 +606,6 @@ TAO_DynStruct_i::to_any (void) CORBA::Boolean TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -684,9 +647,6 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs) void TAO_DynStruct_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -711,10 +671,6 @@ TAO_DynStruct_i::destroy (void) DynamicAny::DynAny_ptr TAO_DynStruct_i::current_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index 0733c23c2dd..56c9974b308 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -68,97 +68,53 @@ public: virtual DynamicAny::FieldName current_member_name ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::TCKind current_member_kind ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual DynamicAny::NameValuePairSeq *get_members ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_members ( const DynamicAny::NameValuePairSeq& value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any ( const CORBA::Any & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::Any * to_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void destroy ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr current_component ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; private: /// Check if the typecode is acceptable. diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index c7244a13747..6e9f82b2bea 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -138,11 +138,6 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref) // an Any argument. void TAO_DynUnion_i::set_from_any (const CORBA::Any & any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAnyFactory::InconsistentTypeCode - )) { // discriminator_type () does not work with aliased type codes, // only on unions, so strip the alias out of the type code @@ -298,9 +293,6 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any) DynamicAny::DynAny_ptr TAO_DynUnion_i::get_discriminator (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -318,10 +310,6 @@ TAO_DynUnion_i::get_discriminator (void) void TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { @@ -437,10 +425,6 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value) void TAO_DynUnion_i::set_to_default_member (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { @@ -485,10 +469,6 @@ TAO_DynUnion_i::set_to_default_member (void) void TAO_DynUnion_i::set_to_no_active_member (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { @@ -540,9 +520,6 @@ TAO_DynUnion_i::set_to_no_active_member (void) CORBA::Boolean TAO_DynUnion_i::has_no_active_member (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -556,9 +533,6 @@ TAO_DynUnion_i::has_no_active_member (void) CORBA::TCKind TAO_DynUnion_i::discriminator_kind (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -576,10 +550,6 @@ TAO_DynUnion_i::discriminator_kind (void) DynamicAny::DynAny_ptr TAO_DynUnion_i::member (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -605,10 +575,6 @@ TAO_DynUnion_i::member (void) char * TAO_DynUnion_i::member_name (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -631,10 +597,6 @@ TAO_DynUnion_i::member_name (void) CORBA::TCKind TAO_DynUnion_i::member_kind (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -662,11 +624,6 @@ TAO_DynUnion_i::member_kind (void) void TAO_DynUnion_i::from_any (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { if (this->destroyed_) { @@ -699,9 +656,6 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any) CORBA::Any_ptr TAO_DynUnion_i::to_any (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -794,9 +748,6 @@ TAO_DynUnion_i::to_any (void) CORBA::Boolean TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -832,9 +783,6 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs) void TAO_DynUnion_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->destroyed_) { @@ -863,10 +811,6 @@ TAO_DynUnion_i::destroy (void) DynamicAny::DynAny_ptr TAO_DynUnion_i::current_component (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { if (this->destroyed_) { @@ -897,9 +841,6 @@ CORBA::Boolean TAO_DynUnion_i::label_match (const CORBA::Any &my_any, const CORBA::Any &other_any ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Use my_any so we can detect a default case label, // if we are iterating through the union type code's diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index 28ac989dd3b..819b8a10391 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -65,126 +65,70 @@ public: virtual DynamicAny::DynAny_ptr get_discriminator ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void set_discriminator ( DynamicAny::DynAny_ptr d ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; virtual void set_to_default_member ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; virtual void set_to_no_active_member ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; virtual CORBA::Boolean has_no_active_member ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::TCKind discriminator_kind ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr member ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); +; virtual char * member_name ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::TCKind member_kind ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); +; // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any ( const CORBA::Any & value ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); +; virtual CORBA::Any * to_any ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual void destroy ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual DynamicAny::DynAny_ptr current_component ( void) - - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); +; private: /// Code common to the constructor from an Any arg and the member /// function from_any(). void set_from_any (const CORBA::Any &any - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAnyFactory::InconsistentTypeCode - )); + ); /// Called by both versions of init(). void init_common (void); @@ -192,10 +136,7 @@ private: /// Iterative check for label value match. CORBA::Boolean label_match (const CORBA::Any &my_any, const CORBA::Any &other_any - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// Use copy() or assign() instead of these. TAO_DynUnion_i (const TAO_DynUnion_i &src); diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp index f56839ce40f..0b5ee19d56d 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.cpp +++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp @@ -20,10 +20,6 @@ CORBA::Any * TAO_DynValueBox_i::get_boxed_value ( ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -33,11 +29,6 @@ TAO_DynValueBox_i::set_boxed_value ( const CORBA::Any & /* boxed */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -46,10 +37,6 @@ DynamicAny::DynAny_ptr TAO_DynValueBox_i::get_boxed_value_as_dyn_any ( ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -59,10 +46,6 @@ TAO_DynValueBox_i::set_boxed_value_as_dyn_any ( DynamicAny::DynAny_ptr /* boxed */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )) { throw ::CORBA::NO_IMPLEMENT (); } diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h index 4a8bd9c6895..7f7d6f717bf 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.h +++ b/TAO/tao/DynamicAny/DynValueBox_i.h @@ -46,38 +46,21 @@ public: virtual CORBA::Any * get_boxed_value ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void set_boxed_value ( const CORBA::Any & boxed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue - )); + ); virtual void set_boxed_value_as_dyn_any ( DynamicAny::DynAny_ptr boxed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch - )); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp index 2408338eede..40de3f745ed 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp +++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp @@ -17,31 +17,19 @@ TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void) } CORBA::Boolean -TAO_DynValueCommon_i::is_null ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_DynValueCommon_i::is_null (void) { throw ::CORBA::NO_IMPLEMENT (); } void -TAO_DynValueCommon_i::set_to_null ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_DynValueCommon_i::set_to_null (void) { throw ::CORBA::NO_IMPLEMENT (); } void -TAO_DynValueCommon_i::set_to_value ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +TAO_DynValueCommon_i::set_to_value (void) { throw ::CORBA::NO_IMPLEMENT (); } diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h index 654619bcc04..462eb86b53e 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.h +++ b/TAO/tao/DynamicAny/DynValueCommon_i.h @@ -44,23 +44,11 @@ public: ~TAO_DynValueCommon_i (void); - virtual CORBA::Boolean is_null ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CORBA::Boolean is_null (void); - virtual void set_to_null ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void set_to_null (void); - virtual void set_to_value ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void set_to_value (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp index bf9813ca099..788af58bdeb 100644 --- a/TAO/tao/DynamicAny/DynValue_i.cpp +++ b/TAO/tao/DynamicAny/DynValue_i.cpp @@ -19,11 +19,6 @@ TAO_DynValue_i::~TAO_DynValue_i (void) char * TAO_DynValue_i::current_member_name ( void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -31,11 +26,6 @@ TAO_DynValue_i::current_member_name ( CORBA::TCKind TAO_DynValue_i::current_member_kind ( void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -43,9 +33,6 @@ TAO_DynValue_i::current_member_kind ( DynamicAny::NameValuePairSeq * TAO_DynValue_i::get_members ( void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -54,11 +41,6 @@ void TAO_DynValue_i::set_members ( const DynamicAny::NameValuePairSeq & /* value */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -66,9 +48,6 @@ TAO_DynValue_i::set_members ( DynamicAny::NameDynAnyPairSeq * TAO_DynValue_i::get_members_as_dyn_any ( void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw ::CORBA::NO_IMPLEMENT (); } @@ -77,11 +56,6 @@ void TAO_DynValue_i::set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & /* value */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )) { throw ::CORBA::NO_IMPLEMENT (); } diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h index 205073b735c..da927158cf8 100644 --- a/TAO/tao/DynamicAny/DynValue_i.h +++ b/TAO/tao/DynamicAny/DynValue_i.h @@ -45,50 +45,24 @@ public: ~TAO_DynValue_i (void); virtual char * current_member_name ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual CORBA::TCKind current_member_kind ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + void); virtual DynamicAny::NameValuePairSeq * get_members ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual void set_members ( const DynamicAny::NameValuePairSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void); virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue - )); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 99c4133f520..947f67c30c6 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -24,7 +24,6 @@ CORBA::Object_ptr TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index cf5aa46991c..4f75403d742 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -39,8 +39,7 @@ public: /// Creates a DynamicAny factory and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv []) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 978f2d03f5f..4f369575dda 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -5,7 +5,6 @@ ACE_RCSID (DynamicInterface, "$Id$") #include "tao/AnyTypeCode/TypeCode.h" -#include "tao/Environment.h" #include "tao/CORBA_String.h" #include "tao/SystemException.h" diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 69e89b78071..0d8859ead93 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -36,7 +36,6 @@ #include "ace/Unbounded_Queue.h" #include "ace/Atomic_Op.h" -#include "ace/CORBA_macros.h" #include "ace/Synch_Traits.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp index 7a0968c2b0a..4f0462c8ce7 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp @@ -4,7 +4,7 @@ #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/Any_Impl.h" #include "tao/operation_details.h" - +#include "tao/SystemException.h" ACE_RCSID (DynamicInterface, DII_Arguments_Converter_Impl, diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index c62aebedab5..ff82a8fce72 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -16,6 +16,7 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -49,7 +50,6 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 Dynamic::ParameterList * DII_Invocation::arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = @@ -74,17 +74,14 @@ namespace TAO Invocation_Status DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { return Synch_Twoway_Invocation::remote_twoway (max_wait_time); } Invocation_Status DII_Invocation::handle_user_exception (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::Exception)) { - Reply_Guard mon (this, - TAO_INVOKE_FAILURE); + Reply_Guard mon (this, TAO_INVOKE_FAILURE); if (TAO_debug_level > 3) { @@ -175,7 +172,6 @@ namespace TAO //@NOTE: Need to figure a way to share this code Dynamic::ParameterList * DII_Deferred_Invocation::arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = @@ -200,7 +196,6 @@ namespace TAO Invocation_Status DII_Deferred_Invocation::remote_invocation (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { this->safe_rd_->transport (this->resolver_.transport ()); diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index 11bb74a18dc..d50f04ba302 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -53,15 +53,12 @@ namespace TAO bool response_expected = true); #if TAO_HAS_INTERCEPTORS ==1 - virtual Dynamic::ParameterList *arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::ParameterList *arguments (void); #endif /*TAO_HAS_INTERCEPTORS == 1*/ - Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time); - virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::Exception)); + virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr); private: CORBA::ExceptionList *excp_list_; @@ -85,12 +82,10 @@ namespace TAO bool response_expected = true); #if TAO_HAS_INTERCEPTORS ==1 - virtual Dynamic::ParameterList *arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::ParameterList *arguments (void); #endif /*TAO_HAS_INTERCEPTORS == 1*/ - Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time); private: diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index e24bc1fc340..5d50bf8900a 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -9,6 +9,7 @@ #include "tao/Transport.h" #include "tao/Transport.h" #include "tao/Pluggable_Messaging.h" +#include "tao/SystemException.h" #include "tao/DynamicInterface/Request.h" #include "ace/os_include/os_errno.h" @@ -77,15 +78,11 @@ namespace TAO this->request_); - Invocation_Status status = - synch.remote_invocation (max_wait_time - ); - + Invocation_Status status = synch.remote_invocation (max_wait_time); if (status == TAO_INVOKE_RESTART && synch.is_forwarded ()) { - effective_target = - synch.steal_forwarded_reference (); + effective_target = synch.steal_forwarded_reference (); #if TAO_HAS_INTERCEPTORS == 1 const CORBA::Boolean permanent_forward = diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index 600cf15f5a9..65381aaf144 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -35,7 +35,6 @@ class TAO_DII_Deferred_Reply_Dispatcher; namespace CORBA { class Object; - class SystemException; class ExceptionList; class Request; } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 2155ff18637..f48bef39dc6 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -2,11 +2,10 @@ #include "tao/DynamicInterface/DII_Reply_Dispatcher.h" #include "tao/DynamicInterface/Request.h" -#include "tao/Environment.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Pluggable_Messaging_Utils.h" - +#include "tao/SystemException.h" ACE_RCSID(DynamicInterface, DII_Reply_Dispatcher, diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index 17e490a305e..cb4e04a7e8f 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -7,7 +7,7 @@ ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$") #include "tao/DynamicInterface/Request.h" #include "tao/DynamicInterface/Server_Request.h" #include "tao/ORB_Core.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index d8c5fcd62f5..7263b740ba1 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -5,7 +5,6 @@ ACE_RCSID (DynamicInterface, "$Id$") #include "tao/AnyTypeCode/TypeCode.h" -#include "tao/Environment.h" #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index f16bf850b49..fc2d5848b3e 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -39,7 +39,6 @@ #include "ace/Unbounded_Queue.h" #include "ace/Atomic_Op.h" -#include "ace/CORBA_macros.h" #include "ace/Synch_Traits.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 72d8ba4c136..99f6a45212a 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -3,17 +3,15 @@ #include "tao/DynamicInterface/Unknown_User_Exception.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" - ACE_RCSID (DynamicInterface, Unknown_User_Exception, "$Id$") diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index ed9a0f22403..41858d37da7 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -20,11 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" - #include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp index c65338b9971..8f75a01f480 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp @@ -35,8 +35,7 @@ TAO_EndpointPolicy_Initializer::init (void) orb_initializer = temp_orb_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); } catch (const ::CORBA::Exception& ex) { diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp index a1ffef2b9d3..b0d51bbd0f6 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp @@ -30,10 +30,7 @@ TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core) CORBA::Policy_ptr TAO_EndpointPolicy_Factory::create_policy ( CORBA::PolicyType type, - const CORBA::Any &value - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) + const CORBA::Any &value) { if (type == EndpointPolicy::ENDPOINT_POLICY_TYPE) { @@ -74,7 +71,7 @@ TAO_EndpointPolicy_Factory::create_policy ( if (!found_one) throw ::CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY_VALUE); - TAO_EndpointPolicy_i *tmp; + TAO_EndpointPolicy_i *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_EndpointPolicy_i (*endpoint_list), CORBA::NO_MEMORY (TAO::VMCID, diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h index 0877fa147df..b4aa4f331ee 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h @@ -48,9 +48,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + ); private: TAO_ORB_Core * orb_core_; diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp index 95f7ec19b8f..82f8f77d499 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp @@ -17,7 +17,6 @@ void TAO_EndpointPolicy_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -25,7 +24,6 @@ void TAO_EndpointPolicy_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info ); diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h index b75c52d370a..04bb65e447a 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h @@ -50,12 +50,10 @@ public: //@{ virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); //@} diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp index 955e6854896..335a5dd7c11 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp @@ -1,14 +1,12 @@ // $Id$ #include "tao/EndpointPolicy/EndpointPolicy_i.h" - #include "tao/SystemException.h" ACE_RCSID (EndpointPolicy, EndpointPolicy_i, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value) @@ -33,7 +31,6 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i () CORBA::PolicyType TAO_EndpointPolicy_i::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return EndpointPolicy::ENDPOINT_POLICY_TYPE; } @@ -50,7 +47,6 @@ TAO_EndpointPolicy_i::clone (void) const EndpointPolicy::EndpointList * TAO_EndpointPolicy_i::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { EndpointPolicy::EndpointList* list = 0; ACE_NEW_RETURN (list, @@ -62,7 +58,6 @@ TAO_EndpointPolicy_i::value (void) CORBA::Policy_ptr TAO_EndpointPolicy_i::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EndpointPolicy_i* servant = 0; ACE_NEW_THROW_EX (servant, @@ -74,7 +69,6 @@ TAO_EndpointPolicy_i::copy (void) void TAO_EndpointPolicy_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->value_.length (0); } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index 429b6681ebe..66cee376baa 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -60,24 +60,18 @@ public: // = The EndpointPolicy::Policy methods - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; virtual EndpointPolicy::EndpointList * value ( void - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: /// The attribute diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp index d33e3e36942..4cd7b83ce7d 100644 --- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp +++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp @@ -83,35 +83,30 @@ IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor) const char * IIOPEndpointValue_i::host (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->host_.in()); } void IIOPEndpointValue_i::host (const char *h) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->host_ = h; } CORBA::UShort IIOPEndpointValue_i::port (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->port_; } void IIOPEndpointValue_i::port (CORBA::UShort p ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->port_ = p; } CORBA::ULong IIOPEndpointValue_i::protocol_tag (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return IOP::TAG_INTERNET_IOP; } diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h index 00f3bdad5dd..f42b3b52043 100644 --- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h +++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h @@ -84,20 +84,15 @@ public: CORBA::Boolean validate_acceptor (TAO_Acceptor *) const; /// Host attribute get/set operators. - char * host (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - void host (const char * h) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * host (void); + void host (const char * h); /// Port attribute get/set operators. - CORBA::UShort port (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - void port (CORBA::UShort p) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::UShort port (void); + void port (CORBA::UShort p); // Protocol tag get operator, inherited from EndpointValueBase - CORBA::ULong protocol_tag (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong protocol_tag (void); private: CORBA::Boolean is_equivalent_i (CORBA::UShort port, const char *host) const; diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h index 83d838a6f84..842445db1fd 100644 --- a/TAO/tao/Endpoint_Selector_Factory.h +++ b/TAO/tao/Endpoint_Selector_Factory.h @@ -27,7 +27,6 @@ #include /**/ "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 6f9db22679c..7c1ff3dced7 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -38,7 +38,6 @@ CORBA::Object_ptr TAO_FILE_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only // called if <match_prefix> returns 1. diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 5946fc9e86f..622a5e1b4fb 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -47,8 +47,7 @@ public: virtual bool match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index bee6b9d2a62..2bb432ebf57 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -20,7 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Basic_Types.h" +#include "tao/TAO_Export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -65,9 +66,7 @@ public: /// Write the reply header in to @a output virtual bool write_reply_header ( TAO_OutputCDR &output, - TAO_Pluggable_Reply_Params_Base &reply - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + TAO_Pluggable_Reply_Params_Base &reply) = 0; /// Writes the locate _reply message in to the @a output virtual bool write_locate_reply_mesg ( @@ -86,8 +85,7 @@ public: /// Parse the Loacte Request Header from the incoming stream. This will do a /// version specific parsing of the incoming Request header - virtual int parse_locate_header ( - TAO_GIOP_Locate_Request_Header &) = 0; + virtual int parse_locate_header (TAO_GIOP_Locate_Request_Header &) = 0; /// Parse the reply message virtual int parse_reply (TAO_InputCDR &input, diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 76dc07c84e4..f634e2beac2 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -148,7 +148,6 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header ( TAO_Pluggable_Reply_Params_Base &reply ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Write the service context list. #if (TAO_HAS_MINIMUM_CORBA == 1) diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 45dbb9f62c5..c209644d37b 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -41,8 +41,7 @@ public: virtual bool write_request_header ( const TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - TAO_OutputCDR &msg - ); + TAO_OutputCDR &msg); /// Write the LocateRequest header virtual bool write_locate_request_header ( @@ -56,8 +55,7 @@ public: TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Writes the locate _reply message in to the @a output virtual bool write_locate_reply_mesg ( diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 5dc4cf05c60..2854acd6de4 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -119,7 +119,6 @@ bool TAO_GIOP_Message_Generator_Parser_12::write_reply_header ( TAO_OutputCDR & output, TAO_Pluggable_Reply_Params_Base &reply) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Write the request ID output.write_ulong (reply.request_id_); diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 2fb34e24a4b..9fe63865a35 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -58,8 +58,7 @@ public: TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Writes the locate _reply message in to the @a output virtual bool write_locate_reply_mesg ( diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index c0069d41d13..e70a7fb4a7b 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1171,7 +1171,6 @@ TAO_GIOP_Message_Lite::write_reply_header ( TAO_Pluggable_Reply_Params_Base &reply /* */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Write the GIOP Lite header first this->write_protocol_header (TAO_GIOP_REPLY, diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index df7fd9c33f9..3eb46c95ba3 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -24,7 +24,6 @@ #include "tao/Pluggable_Messaging_Utils.h" #include "tao/GIOP_Utils.h" -#include "tao/SystemException.h" #include "tao/CDR.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -252,8 +251,7 @@ private: int write_reply_header ( TAO_OutputCDR &output, TAO_Pluggable_Reply_Params_Base &reply - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Writes the locate _reply message in to the <output> int write_locate_reply_mesg ( diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp index 3453287349e..9cc6d00e739 100644 --- a/TAO/tao/HTTP_Parser.cpp +++ b/TAO/tao/HTTP_Parser.cpp @@ -4,12 +4,14 @@ #include "tao/HTTP_Client.h" #include "tao/ORB.h" #include "tao/Object.h" +#include "tao/SystemException.h" #include "ace/Read_Buffer.h" #include "ace/Malloc_Base.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, HTTP_Parser, @@ -36,7 +38,6 @@ CORBA::Object_ptr TAO_HTTP_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Skip the prefix, we know it is there because this method in only // called if <match_prefix> returns 1. diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h index b55ad6a00e3..931bc9bec03 100644 --- a/TAO/tao/HTTP_Parser.h +++ b/TAO/tao/HTTP_Parser.h @@ -48,8 +48,7 @@ public: virtual bool match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index 246a1b678ef..4d9bae8a588 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -15,14 +15,12 @@ #define TAO_IFR_CLIENT_ADAPTER_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" - #include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" #include "tao/orbconf.h" diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index bf18d18008a..1af0fb429cf 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -17,6 +17,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_time.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, IIOP_Connector, diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp index 472a225e8b5..aca2830859c 100644 --- a/TAO/tao/IORInterceptor/IORInfo.cpp +++ b/TAO/tao/IORInterceptor/IORInfo.cpp @@ -29,7 +29,6 @@ TAO_IORInfo::~TAO_IORInfo (void) CORBA::Policy_ptr TAO_IORInfo::get_effective_policy (CORBA::PolicyType type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -51,7 +50,6 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type void TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -68,7 +66,6 @@ TAO_IORInfo::add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -82,7 +79,6 @@ TAO_IORInfo::add_ior_component_to_profile ( char * TAO_IORInfo::manager_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -92,7 +88,6 @@ TAO_IORInfo::manager_id (void) PortableInterceptor::AdapterState TAO_IORInfo::state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -101,7 +96,6 @@ TAO_IORInfo::state (void) PortableInterceptor::ObjectReferenceTemplate * TAO_IORInfo::adapter_template (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -123,7 +117,6 @@ TAO_IORInfo::adapter_template (void) PortableInterceptor::ObjectReferenceFactory * TAO_IORInfo::current_factory (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -147,7 +140,6 @@ void TAO_IORInfo::current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index df8723f914f..ab1de4f7bcc 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -62,43 +62,35 @@ public: /// effect for the object whose IOR is being created. virtual CORBA::Policy_ptr get_effective_policy ( CORBA::PolicyType type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Add the given tagged component to all profiles. virtual void add_ior_component ( const IOP::TaggedComponent & component - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Add the given tagged component to all profiles matching the given /// ProfileId. virtual void add_ior_component_to_profile ( const IOP::TaggedComponent & component, IOP::ProfileId profile_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual char * manager_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual PortableInterceptor::AdapterState state ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual PortableInterceptor::ObjectReferenceFactory * current_factory ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual void current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); //@} diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp index b542945f036..b0204d72240 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp @@ -18,7 +18,6 @@ TAO_IORInterceptor_Adapter_Factory_Impl::~ TAO_IORInterceptor_Adapter * TAO_IORInterceptor_Adapter_Factory_Impl::create (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IORInterceptor_Adapter_Impl *nia = 0; ACE_NEW_THROW_EX (nia, diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h index 6696a5320c2..81815bfac90 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h @@ -43,8 +43,7 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl public: virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void); - virtual TAO_IORInterceptor_Adapter * create (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TAO_IORInterceptor_Adapter * create (void); // Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index e09b1b72eaf..56728db7e70 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -53,7 +53,6 @@ void TAO_IORInterceptor_Adapter_Impl::establish_components ( TAO_Root_POA* poa ) - ACE_THROW_SPEC ((CORBA::SystemException)) { const size_t interceptor_count = this->ior_interceptor_list_.size (); @@ -127,7 +126,6 @@ void TAO_IORInterceptor_Adapter_Impl::components_established ( PortableInterceptor::IORInfo_ptr info ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles @@ -166,7 +164,6 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, PortableInterceptor::AdapterState state ) - ACE_THROW_SPEC ((CORBA::SystemException)) { const size_t interceptor_count = this->ior_interceptor_list_.size (); @@ -210,7 +207,6 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState state ) - ACE_THROW_SPEC ((CORBA::SystemException)) { /// Whenever the POAManager state is changed, the /// adapter_manager_state_changed method is to be invoked on all the IOR diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h index 9094acb23fc..bfd1492c220 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h @@ -64,26 +64,22 @@ public: virtual void destroy_interceptors (void); - virtual void establish_components (TAO_Root_POA *poa ) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void establish_components (TAO_Root_POA *poa ); /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. virtual void components_established (PortableInterceptor::IORInfo_ptr info - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState state - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); private: /// List of IOR interceptors maintained diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp index 6dfeb9f191c..b881e436af0 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp @@ -1,19 +1,16 @@ #include "tao/IORInterceptor/IORInterceptor_Details.h" +#include "tao/SystemException.h" ACE_RCSID (IORInterceptor, IORInterceptor_Details, "$Id$") -#include "tao/SystemException.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { void - IORInterceptor_Details::apply_policies ( - const CORBA::PolicyList &/*policies*/ - ) + IORInterceptor_Details::apply_policies (const CORBA::PolicyList &) { // There are currently no policies that apply to IOR Interceptors. throw ::CORBA::INV_POLICY (); diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index 3df2602431e..0579d23a713 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -22,9 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" #include "tao/PI_ForwardC.h" #include "tao/Policy_ForwardC.h" +#include "tao/TAO_Export.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> class ACE_Array_Base; @@ -80,23 +80,20 @@ public: * IORInterceptor::components_established() once the former is * completed. */ - virtual void establish_components (TAO_Root_POA *poa) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + virtual void establish_components (TAO_Root_POA *poa) = 0; /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. virtual void components_established (PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual void adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + PortableInterceptor::AdapterState state) = 0; virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + PortableInterceptor::AdapterState state) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index 34c70a02360..43a176f2f5b 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -21,7 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" +#include "tao/TAO_Export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -42,8 +43,7 @@ class TAO_Export TAO_IORInterceptor_Adapter_Factory public: virtual ~TAO_IORInterceptor_Adapter_Factory (void); - virtual TAO_IORInterceptor_Adapter * create (void) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + virtual TAO_IORInterceptor_Adapter * create (void) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index adcb4b6d6ca..f9a82d8050e 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -20,7 +20,6 @@ TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[] ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index 8bfbd4e69e2..6c00429e3a3 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -39,8 +39,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index e86cfaa9ac5..614e4ef86de 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -25,12 +25,7 @@ TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void) CORBA::Object_ptr TAO_IOR_Manipulation_impl::merge_iors ( - const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - ) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::EmptyProfileList, - TAO_IOP::Duplicate, - TAO_IOP::Invalid_IOR)) + const TAO_IOP::TAO_IOR_Manipulation::IORList & iors) { // we need to create a new CORBA::Object which has the union of the // two profile lists. However, if any profiles are duplicates (i.e. in @@ -91,8 +86,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( TAO_ORB_Core *orb_core = TAO_ORB_Core_instance (); TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string - Merged_Profiles - ); + Merged_Profiles); // Make the stub memory allocation exception safe for the duration // of this method. @@ -123,12 +117,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( CORBA::Object_ptr TAO_IOR_Manipulation_impl::add_profiles ( CORBA::Object_ptr ior1, - CORBA::Object_ptr ior2 - ) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::EmptyProfileList, - TAO_IOP::Duplicate, - TAO_IOP::Invalid_IOR)) + CORBA::Object_ptr ior2) { // Get an estimate of the number of profiles @@ -144,12 +133,6 @@ TAO_IOR_Manipulation_impl::remove_profiles ( CORBA::Object_ptr group, CORBA::Object_ptr ior2 ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::EmptyProfileList, - TAO_IOP::NotFound - )) { // First verify they are the same type! CORBA::String_var id = @@ -231,9 +214,6 @@ TAO_IOR_Manipulation_impl::set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group ) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::Duplicate)) { // make sure we have some profiles if (group->_stubobj ()->base_profiles ().profile_count () == 0) @@ -251,10 +231,6 @@ TAO_IOR_Manipulation_impl::set_primary ( CORBA::Object_ptr new_primary, CORBA::Object_ptr group ) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::Duplicate, - TAO_IOP::MultiProfileList)) { // make sure we have some profiles in GROUP if (group->_stubobj ()->base_profiles ().profile_count () == 0) @@ -277,10 +253,6 @@ TAO_IOR_Manipulation_impl::get_primary ( CORBA::Object_ptr group ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound - )) { // make sure we have some profiles in IOR if (group->_stubobj ()->base_profiles ().profile_count () == 0) @@ -297,9 +269,7 @@ TAO_IOR_Manipulation_impl::get_primary ( CORBA::Boolean TAO_IOR_Manipulation_impl::is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, - CORBA::Object_ptr group - ) - ACE_THROW_SPEC ((CORBA::SystemException)) + CORBA::Object_ptr group) { return prop->is_primary_set (group); } @@ -307,9 +277,7 @@ TAO_IOR_Manipulation_impl::is_primary_set ( CORBA::Boolean TAO_IOR_Manipulation_impl:: remove_primary_tag ( TAO_IOP::TAO_IOR_Property_ptr prop, - CORBA::Object_ptr group - ) - ACE_THROW_SPEC ((CORBA::SystemException)) + CORBA::Object_ptr group) { return prop->remove_primary_tag (group); } @@ -319,8 +287,6 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 ) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::NotFound)) { CORBA::ULong count = 0; TAO_Profile *pfile1, *pfile2; @@ -345,14 +311,9 @@ TAO_IOR_Manipulation_impl::is_in_ior ( } CORBA::ULong -TAO_IOR_Manipulation_impl::get_profile_count ( - CORBA::Object_ptr group - ) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::EmptyProfileList)) +TAO_IOR_Manipulation_impl::get_profile_count (CORBA::Object_ptr group) { - CORBA::ULong count; - count = group->_stubobj ()->base_profiles ().profile_count (); + CORBA::ULong const count = group->_stubobj ()->base_profiles ().profile_count (); if (count == 0) throw TAO_IOP::EmptyProfileList (); diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index d81fedd2886..925c45a359d 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -55,46 +55,23 @@ public: virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::EmptyProfileList, - TAO_IOP::Duplicate, - TAO_IOP::Invalid_IOR - )); + ); virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::EmptyProfileList, - TAO_IOP::Duplicate, - TAO_IOP::Invalid_IOR - )); + ); virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr group, CORBA::Object_ptr ior2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::EmptyProfileList, - TAO_IOP::NotFound - )); + ); virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::Duplicate - )); +; // @@ note awkward argument order virtual CORBA::Boolean set_primary ( @@ -102,57 +79,33 @@ public: CORBA::Object_ptr new_primary, CORBA::Object_ptr group ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::Duplicate, - TAO_IOP::MultiProfileList - )); +; virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group ) - - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound - )); +; virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group ) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; virtual CORBA::Boolean remove_primary_tag ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr iogr - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound - )); + ); virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr group - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::EmptyProfileList - )); + ); protected: diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 388285dae98..132144ddd86 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -53,7 +53,6 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void) char * TAO_IOR_Table_Impl::find (const char *object_key) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { // We don't want the lock held during locate, so make it go out // of scope before then. @@ -75,7 +74,6 @@ TAO_IOR_Table_Impl::find (const char *object_key) void TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::AlreadyBound)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.bind (object_key, IOR) != 0) @@ -84,7 +82,6 @@ TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR) void TAO_IOR_Table_Impl::rebind (const char * object_key, const char * IOR) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->map_.rebind (object_key, IOR); @@ -92,7 +89,6 @@ TAO_IOR_Table_Impl::rebind (const char * object_key, const char * IOR) void TAO_IOR_Table_Impl::unbind (const char * object_key) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.unbind (object_key) != 0) @@ -101,7 +97,6 @@ TAO_IOR_Table_Impl::unbind (const char * object_key) void TAO_IOR_Table_Impl::set_locator (IORTable::Locator_ptr locator) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->locator_ = IORTable::Locator::_duplicate (locator); diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index e04d59d55dd..08d7eeb1b0d 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -55,8 +55,7 @@ public: TAO_IOR_Table_Impl (void); /// Find the object, using the locator if it is not on the table. - char *find (const char *object_key) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); + char *find (const char *object_key); /** * @name The IORTable::Table methods @@ -64,17 +63,13 @@ public: * Please check the IORTable.pidl file for details. */ //@{ - virtual void bind (const char * object_key, const char * IOR) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::AlreadyBound)); + virtual void bind (const char * object_key, const char * IOR); - virtual void rebind (const char * object_key, const char * IOR) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void rebind (const char * object_key, const char * IOR); - virtual void unbind (const char * object_key) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); + virtual void unbind (const char * object_key); - virtual void set_locator (IORTable::Locator_ptr the_locator) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_locator (IORTable::Locator_ptr the_locator); //@} private: diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index 0fb63c1df41..5d836646df0 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -101,7 +101,6 @@ int TAO_Table_Adapter::dispatch (TAO::ObjectKey &key, TAO_ServerRequest &, CORBA::Object_out forward_to) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IOR_Table_Impl_var rootref; { @@ -190,7 +189,6 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *stub) CORBA::Long TAO_Table_Adapter::find_object (TAO::ObjectKey &key, CORBA::Object_out forward_to) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var object_key; TAO::ObjectKey::encode_sequence_to_string (object_key.out (), key); diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index 628b1a4d8ae..ffeafdb2a8c 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -49,8 +49,7 @@ public: virtual int priority (void) const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, - CORBA::Object_out foward_to) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_out foward_to); virtual const char *name (void) const; virtual CORBA::Object_ptr root (void); @@ -64,8 +63,7 @@ private: /// Helper method to find an object bound in the table. /// @return 1 if found, 0 otherwise. CORBA::Long find_object (TAO::ObjectKey &key, - CORBA::Object_out forward_to) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_out forward_to); /// The ORB Core we belong to TAO_ORB_Core &orb_core_; diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index c53c0594e36..8d2cdbd8289 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -21,7 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" +#include "tao/TAO_Export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -60,7 +61,7 @@ public: * INV_OBJREF, etc.) */ virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp index 711732af5aa..08fe8da3515 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.cpp +++ b/TAO/tao/ImR_Client/ServerObject_i.cpp @@ -15,13 +15,11 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb, void ServerObject_i::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerObject_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Note : We want our child POAs to be able to unregister themselves from // the ImR, so we must destroy them before shutting down the orb. diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h index cb997f85b22..cd6d8191b7a 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.h +++ b/TAO/tao/ImR_Client/ServerObject_i.h @@ -44,12 +44,10 @@ public: ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); /// Ping method. - void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void ping (void); /// Shutdown the server. - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); /// Returns the default POA for this servant. PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 4bb1a3fb5e5..ca7eadfdfdc 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -13,7 +13,7 @@ #include "tao/Collocation_Proxy_Broker.h" #include "tao/GIOP_Utils.h" #include "tao/TAOC.h" - +#include "tao/SystemException.h" #include "ace/Service_Config.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index c6da4157d14..8897da1dd84 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -20,9 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// @NOTE: Do not include any headers unessarily here. -#include "ace/CORBA_macros.h" - #include /**/ "tao/TAO_Export.h" #include "tao/Invocation_Utils.h" #include "tao/Collocation_Strategy.h" diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index 85b35de3d62..48a0a6f557a 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -85,7 +85,6 @@ namespace TAO Invocation_Status Invocation_Base::send_request_interception (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (adapter_ != 0) { @@ -115,7 +114,6 @@ namespace TAO Invocation_Status Invocation_Base::receive_reply_interception (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (adapter_ != 0) { @@ -148,7 +146,6 @@ namespace TAO Invocation_Status Invocation_Base::receive_other_interception (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (adapter_ != 0) { diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 53caa67ffe2..24e383404f4 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -198,18 +198,15 @@ namespace TAO protected: /// Helper method to invoke send_request interception call to all /// the registered interceptors. - Invocation_Status send_request_interception (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Invocation_Status send_request_interception (void); /// Helper method to invoke receive_reply interception call to all /// the registered interceptors. - Invocation_Status receive_reply_interception (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Invocation_Status receive_reply_interception (void); /// Helper method to invoke receive_other interception call to all /// the registered interceptors. - Invocation_Status receive_other_interception (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Invocation_Status receive_other_interception (void); /// Helper methods to handle interception calls when exceptions /// are thrown by the PortableInterceptor. diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index 9e29aa34ad7..baff9eddef3 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -26,8 +26,6 @@ #include /**/ "tao/Versioned_Namespace.h" -#include "ace/CORBA_macros.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index b1ad9eba1dc..1801651cc72 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -60,7 +60,6 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum) CORBA::Boolean CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj) - ACE_THROW_SPEC (()) { return (other_obj == this) ? true : false; } diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index bc700bac3c3..74edf65f639 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -140,8 +140,7 @@ namespace CORBA * different ORB protocols are in use) there is no default * implementation. */ - virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj) - ACE_THROW_SPEC (()); + virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj); // = Reference count managment. /// Increment the reference count. diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index b9b34291402..5e485ababd6 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -8,6 +8,7 @@ #include "tao/GIOP_Utils.h" #include "tao/Profile.h" #include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/Countdown_Time.h" @@ -32,7 +33,6 @@ namespace TAO Invocation_Status LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { ACE_Countdown_Time countdown (max_wait_time); diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h index d1aaebf63da..5605c65ad04 100644 --- a/TAO/tao/LocateRequest_Invocation.h +++ b/TAO/tao/LocateRequest_Invocation.h @@ -27,11 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Synch_Reply_Dispatcher; -namespace CORBA -{ - class SystemException; -} - namespace TAO { class Profile_Transport_Resolver; @@ -65,8 +60,7 @@ namespace TAO TAO_Operation_Details &detail); /// Start the invocation. - Invocation_Status invoke (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status invoke (ACE_Time_Value *max_wait_time); private: /// Helper to check the reply status diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index ca3413cebd3..d43fc291c97 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -6,7 +6,7 @@ #include "tao/Transport_Mux_Strategy.h" #include "tao/ORB_Core.h" #include "tao/Stub.h" - +#include "tao/SystemException.h" #include "ace/Service_Config.h" ACE_RCSID (tao, diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h index f0d092ad31b..0e653657f4c 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.h +++ b/TAO/tao/LocateRequest_Invocation_Adapter.h @@ -53,8 +53,7 @@ namespace TAO class TAO_Export LocateRequest_Invocation_Adapter { public: - LocateRequest_Invocation_Adapter ( - CORBA::Object_ptr target); + LocateRequest_Invocation_Adapter (CORBA::Object_ptr target); /// Start the invocation on the target void invoke (void); diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index f9c7f6c60f4..88f391ba04b 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -38,7 +38,6 @@ TAO_MCAST_Parser::match_prefix (const char *ior_string) const CORBA::Object_ptr TAO_MCAST_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *mcast_name = ior + sizeof (::mcast_prefix) + 1; diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index 35c8f170ad7..1065838e85a 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -51,8 +51,7 @@ public: /// Parse the ior-string that is passed. virtual CORBA::Object_ptr parse_string (const char *ior, - CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ORB_ptr orb); private: diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index 2bc39477506..352ffc47871 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -9,6 +9,7 @@ #include "ace/Log_Msg.h" #include "ace/Guard_T.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, MProfile, diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 846a65647fd..e3bd443d1fc 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -133,7 +133,6 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) void TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { - { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -176,8 +175,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (void) } void -TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex - ) +TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -250,7 +248,6 @@ namespace TAO void ARH_Refcount_Functor::operator () ( TAO_AMH_Response_Handler *arh) - ACE_THROW_SPEC (()) { (void) arh->_remove_ref (); } diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 9f25b914054..b8dc247eb2d 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -211,8 +211,7 @@ namespace TAO class TAO_Messaging_Export ARH_Refcount_Functor { public: - void operator() (TAO_AMH_Response_Handler *arh) - ACE_THROW_SPEC (()); + void operator() (TAO_AMH_Response_Handler *arh); }; } diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index c35d2cde9af..b7de10524f4 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -40,7 +40,6 @@ namespace TAO Invocation_Status Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value * max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { TAO_Target_Specification tspec; this->init_target_spec (tspec); diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h index 0aee5c7a088..3a6df1d100d 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.h +++ b/TAO/tao/Messaging/Asynch_Invocation.h @@ -36,11 +36,6 @@ class TAO_Operation_Details; class TAO_InputCDR; class TAO_Asynch_Reply_Dispatcher_Base; -namespace CORBA -{ - class SystemException; -} - namespace TAO { class Profile_Transport_Resolver; @@ -55,9 +50,7 @@ namespace TAO TAO_Asynch_Reply_Dispatcher_Base *rd, bool response_expected = true); - Invocation_Status remote_invocation (ACE_Time_Value *value - ) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status remote_invocation (ACE_Time_Value *value); protected: // To prevent leaking memory from the reply dispatcher that we diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index e8f175910ea..03f84fab1e0 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -25,7 +25,6 @@ #include "tao/Messaging/Messaging.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" #include "tao/Invocation_Adapter.h" -#include "ace/CORBA_macros.h" #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" @@ -43,7 +42,6 @@ class TAO_Asynch_Reply_Dispatcher_Base; namespace CORBA { class Object; - class SystemException; } namespace TAO diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index b4bc0cb4485..a2a1a4b3796 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -8,8 +8,6 @@ #include "tao/ORB_Core.h" #include "tao/Transport.h" -#include "ace/CORBA_macros.h" - ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index d62ce1d8a54..cc34fa8f55a 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -3,6 +3,7 @@ #include "tao/ORB_Core.h" #include "tao/Stub.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "tao/AnyTypeCode/Any.h" ACE_RCSID (Messaging, @@ -37,17 +38,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( } TimeBase::TimeT -TAO_ConnectionTimeoutPolicy::relative_expiry ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_ConnectionTimeoutPolicy::relative_expiry (void) { return this->relative_expiry_; } CORBA::PolicyType -TAO_ConnectionTimeoutPolicy::policy_type ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_ConnectionTimeoutPolicy::policy_type (void) { return TAO::CONNECTION_TIMEOUT_POLICY_TYPE; } @@ -115,7 +112,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val) if ((val >>= value) == 0) throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE); - TAO_ConnectionTimeoutPolicy *tmp; + TAO_ConnectionTimeoutPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_ConnectionTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, @@ -136,7 +133,6 @@ TAO_ConnectionTimeoutPolicy::clone (void) const CORBA::Policy_ptr TAO_ConnectionTimeoutPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! @@ -151,7 +147,6 @@ TAO_ConnectionTimeoutPolicy::copy (void) void TAO_ConnectionTimeoutPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 63f0091e14f..a3e17bb91b8 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -69,17 +69,13 @@ public: virtual TAO_ConnectionTimeoutPolicy *clone (void) const; // = The TAO::ConnectionTinoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT relative_expiry (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 59c8194037f..12bffa243dc 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) TAO_ORB_Core::set_timeout_hook (TAO_RelativeRoundtripTimeoutPolicy::hook); @@ -37,7 +36,6 @@ TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) void TAO_Messaging_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index 443118bf601..d5462ee0dbc 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -49,11 +49,9 @@ public: */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 35af00c3ddd..e54fe791701 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -38,8 +38,6 @@ CORBA::Policy_ptr TAO_Messaging_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE) diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h index a2e5d63eae0..51c46e053ca 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h @@ -43,9 +43,7 @@ class TAO_Messaging_PolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); private: #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) CORBA::Policy_ptr diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 9ab757e6aaa..a4b44a0ac93 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -43,7 +43,6 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( TimeBase::TimeT TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->relative_expiry_; } @@ -51,7 +50,6 @@ TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( CORBA::PolicyType TAO_RelativeRoundtripTimeoutPolicy::policy_type ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; } @@ -140,7 +138,6 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const CORBA::Policy_ptr TAO_RelativeRoundtripTimeoutPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! @@ -155,7 +152,6 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void) void TAO_RelativeRoundtripTimeoutPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -209,7 +205,6 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) CORBA::PolicyType TAO_Sync_Scope_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::SYNC_SCOPE_POLICY_TYPE; } @@ -287,14 +282,12 @@ TAO_Sync_Scope_Policy::clone (void) const Messaging::SyncScope TAO_Sync_Scope_Policy::synchronization (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->synchronization_; } CORBA::Policy_ptr TAO_Sync_Scope_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, @@ -306,7 +299,6 @@ TAO_Sync_Scope_Policy::copy (void) void TAO_Sync_Scope_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } TAO_Cached_Policy_Type diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 34be4fb5093..5da18bf8731 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -62,17 +62,13 @@ public: virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT relative_expiry (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); @@ -128,19 +124,15 @@ public: // = The Messaging::SyncScopePolicy methods. - virtual Messaging::SyncScope synchronization (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Messaging::SyncScope synchronization (void); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index 5c70284e05a..625dfc5afa6 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -24,7 +24,6 @@ #include "tao/Basic_Types.h" #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index b800fa0383b..b9b4c3c5dd4 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -45,7 +45,7 @@ ACE_RCSID (tao, #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" - +#include "ace/CORBA_macros.h" static const char ior_prefix[] = "IOR:"; diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 1882b238e44..dc53a16dde8 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -21,10 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Environment.h" -#include "tao/default_environment.h" - -#include "ace/CORBA_macros.h" +#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 3810b271482..a450106d554 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -22,9 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Basic_Types.h" -#include "tao/SystemException.h" #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index e8fdf30da2e..85411bc3791 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -37,6 +37,7 @@ #include "tao/ORBInitializer_Registry_Adapter.h" #include "tao/Codeset_Manager.h" #include "tao/GIOP_Fragmentation_Strategy.h" +#include "tao/SystemException.h" #include "tao/Valuetype_Adapter.h" #include "tao/Valuetype_Adapter_Factory.h" @@ -52,7 +53,7 @@ #include "ace/Argv_Type_Converter.h" #include "ace/Static_Object_Lock.h" #include "ace/Auto_Ptr.h" - +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // Needed to set ACE_LOG_MSG::msg_ostream() diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp index f38a6462b49..266ed9542f6 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * TAO::ORT_Adapter_Impl::tao_server_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No need to duplicate, the ort_template_ method has to do the duplicate return this->ort_template_->server_id (); @@ -23,7 +22,6 @@ TAO::ORT_Adapter_Impl::tao_server_id (void) char * TAO::ORT_Adapter_Impl::tao_orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No need to duplicate, the ort_template_ method has to do the duplicate return this->ort_template_->orb_id (); @@ -31,7 +29,6 @@ TAO::ORT_Adapter_Impl::tao_orb_id (void) PortableInterceptor::AdapterName * TAO::ORT_Adapter_Impl::tao_adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No need to duplicate, the ort_template_ method has to do the duplicate return this->ort_template_->adapter_name (); @@ -40,7 +37,6 @@ TAO::ORT_Adapter_Impl::tao_adapter_name (void) CORBA::Object_ptr TAO::ORT_Adapter_Impl::make_object (const char *repo_id, const PortableInterceptor::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ort_factory_->make_object (repo_id, id); } diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h index 3b5c09072de..bdc9af25c20 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h @@ -65,14 +65,11 @@ namespace TAO * Methods */ //@{ - virtual char * tao_server_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * tao_server_id (void); - virtual char * tao_orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * tao_orb_id (void); - virtual PortableInterceptor::AdapterName * tao_adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableInterceptor::AdapterName * tao_adapter_name (void); //@} /** @@ -84,8 +81,7 @@ namespace TAO //@{ virtual CORBA::Object_ptr make_object ( const char * repository_id, - const PortableInterceptor::ObjectId & id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableInterceptor::ObjectId & id); //@} private: diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index 6588c5e4a6e..622bb1a0eb5 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -30,21 +30,18 @@ namespace TAO char * ObjectReferenceTemplate::server_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_id_); } char * ObjectReferenceTemplate::orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->orb_id_); } PortableInterceptor::AdapterName * ObjectReferenceTemplate::adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::AdapterName *adapter_name = 0; @@ -65,7 +62,6 @@ namespace TAO const char *, const PortableInterceptor::ObjectId & ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil(poa_.in())) throw ::CORBA::BAD_INV_ORDER (); diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h index eeb4cae1deb..e97ac59a3b0 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h @@ -25,7 +25,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/ObjRefTemplate/Default_ORTC.h" -#include "tao/SystemException.h" #if defined(_MSC_VER) #pragma warning(push) @@ -69,14 +68,11 @@ namespace TAO * PortableInterceptor::ObjectReferenceTemplate ValueType. */ //@{ - virtual char * server_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * server_id (void); - virtual char * orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * orb_id (void); - virtual PortableInterceptor::AdapterName * adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableInterceptor::AdapterName * adapter_name (void); //@} /** @@ -88,8 +84,7 @@ namespace TAO //@{ virtual CORBA::Object_ptr make_object ( const char * repository_id, - const PortableInterceptor::ObjectId & id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableInterceptor::ObjectId & id); //@} protected: diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 631dfb60b16..d3ee0bb6d60 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -22,6 +22,7 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" +#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/Object.inl" @@ -289,7 +290,6 @@ CORBA::Object::_hash (CORBA::ULong maximum) CORBA::Boolean CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj) - ACE_THROW_SPEC (()) { if (other_obj == this) { diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index f57c9399a69..f800a8d16dc 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -150,8 +150,7 @@ namespace CORBA * private state. Since that changes easily (when different ORB * protocols are in use) there is no default implementation. */ - virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj) - ACE_THROW_SPEC (()); + virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj); #if (TAO_HAS_MINIMUM_CORBA == 0) diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index a8c625b6e46..3dcfd290fe8 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -20,7 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" +#include "tao/TAO_Export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -59,8 +60,7 @@ public: */ virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR* argv []) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + ACE_TCHAR* argv []) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 142afaab8b3..ec2b38c65e8 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -15,7 +15,8 @@ #define TAO_OBJECT_REF_TABLE_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +25,6 @@ #include "tao/CORBA_String.h" #include "tao/Object.h" #include /**/ "tao/TAO_Export.h" -#include "tao/orbconf.h" #include "ace/Array_Map.h" diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 1955458c391..8e3212a8138 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -6,6 +6,7 @@ #include "tao/Object_T.h" #include "tao/Stub.h" #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h index eab4ffc985d..cce3cd67c53 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -24,7 +24,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/Versioned_Namespace.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 56941b574ab..f31f071b640 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -15,13 +15,12 @@ #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" #include "tao/varbase.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp index 2fe2023f18e..f806b51a0d0 100644 --- a/TAO/tao/PI/ClientRequestDetails.cpp +++ b/TAO/tao/PI/ClientRequestDetails.cpp @@ -1,4 +1,5 @@ #include "tao/PI/ClientRequestDetails.h" +#include "tao/SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -15,9 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { void - ClientRequestDetails::apply_policies ( - const CORBA::PolicyList &policies - ) + ClientRequestDetails::apply_policies (const CORBA::PolicyList &policies) { // Flag to check for duplicate ProcessingModePolicy objects in the list. bool processing_mode_applied = false; @@ -53,12 +52,10 @@ namespace TAO // Narrow the Policy to the ProcessingModePolicy interface. PortableInterceptor::ProcessingModePolicy_var pm_policy = PortableInterceptor::ProcessingModePolicy::_narrow ( - policy.in () - ); + policy.in ()); // Save the value of the ProcessingModePolicy in our data member. - this->processing_mode_ = - pm_policy->processing_mode (); + this->processing_mode_ = pm_policy->processing_mode (); } else { diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index cd42fb68e7a..365be7c37ba 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -25,6 +25,8 @@ ACE_RCSID (PI, #include "tao/Service_Context.h" #include "tao/Exception_Data.h" +#include "ace/CORBA_macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv) @@ -64,7 +66,6 @@ TAO_ClientRequestInfo::get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; @@ -82,7 +83,6 @@ TAO_ClientRequestInfo::get_service_context_i ( CORBA::Object_ptr TAO_ClientRequestInfo::target (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -91,7 +91,6 @@ TAO_ClientRequestInfo::target (void) CORBA::Object_ptr TAO_ClientRequestInfo::effective_target (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -100,7 +99,6 @@ TAO_ClientRequestInfo::effective_target (void) IOP::TaggedProfile * TAO_ClientRequestInfo::effective_profile (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -138,7 +136,6 @@ TAO_ClientRequestInfo::effective_profile (void) // with the spec. CORBA::Any * TAO_ClientRequestInfo::received_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -176,7 +173,6 @@ TAO_ClientRequestInfo::received_exception (void) char * TAO_ClientRequestInfo::received_exception_id ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -195,7 +191,6 @@ IOP::TaggedComponent * TAO_ClientRequestInfo::get_effective_component ( IOP::ComponentId id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -242,7 +237,6 @@ IOP::TaggedComponentSeq * TAO_ClientRequestInfo::get_effective_components ( IOP::ComponentId id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -298,7 +292,6 @@ TAO_ClientRequestInfo::get_effective_components ( CORBA::Policy_ptr TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -323,7 +316,6 @@ TAO_ClientRequestInfo::add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -339,7 +331,6 @@ TAO_ClientRequestInfo::add_request_service_context ( CORBA::ULong TAO_ClientRequestInfo::request_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -424,7 +415,6 @@ TAO_ClientRequestInfo::request_id (void) char * TAO_ClientRequestInfo::operation (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -434,7 +424,6 @@ TAO_ClientRequestInfo::operation (void) Dynamic::ParameterList * TAO_ClientRequestInfo::arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -472,7 +461,6 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList ¶m_list) Dynamic::ExceptionList * TAO_ClientRequestInfo::exceptions (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -512,7 +500,6 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list) Dynamic::ContextList * TAO_ClientRequestInfo::contexts (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -521,7 +508,6 @@ TAO_ClientRequestInfo::contexts (void) Dynamic::RequestContext * TAO_ClientRequestInfo::operation_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -530,7 +516,6 @@ TAO_ClientRequestInfo::operation_context (void) CORBA::Any * TAO_ClientRequestInfo::result (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -560,7 +545,6 @@ TAO_ClientRequestInfo::result (CORBA::Any *any) CORBA::Boolean TAO_ClientRequestInfo::response_expected (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -569,7 +553,6 @@ TAO_ClientRequestInfo::response_expected (void) Messaging::SyncScope TAO_ClientRequestInfo::sync_scope (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -578,7 +561,6 @@ TAO_ClientRequestInfo::sync_scope (void) PortableInterceptor::ReplyStatus TAO_ClientRequestInfo::reply_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -593,7 +575,6 @@ TAO_ClientRequestInfo::reply_status (void) CORBA::Object_ptr TAO_ClientRequestInfo::forward_reference (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -611,8 +592,6 @@ TAO_ClientRequestInfo::forward_reference (void) CORBA::Any * TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) { this->check_validity (); @@ -624,7 +603,6 @@ IOP::ServiceContext * TAO_ClientRequestInfo::get_request_service_context ( IOP::ServiceId id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -641,7 +619,6 @@ IOP::ServiceContext * TAO_ClientRequestInfo::get_reply_service_context ( IOP::ServiceId id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 22abd55b4d9..e22d0b7be52 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -79,51 +79,42 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. virtual CORBA::ULong request_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the operation name for the current request. virtual char * operation ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the list of arguments passed to the current operation. virtual Dynamic::ParameterList * arguments ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the list of exceptions the current operation is capable /// of throwing. virtual Dynamic::ExceptionList * exceptions ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual Dynamic::ContextList * contexts ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual Dynamic::RequestContext * operation_context ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the result of the current request. If there is no return /// value then an Any with tk_void TypeCode is returned. This is /// method is not valid for oneway operations. virtual CORBA::Any * result ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Returns true for a two-way operation, and false otherwise. virtual CORBA::Boolean response_expected ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + void); /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. virtual Messaging::SyncScope sync_scope ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the reply status for the current request. /** @@ -132,50 +123,41 @@ public: * TRANSPORT_RETRY, UNKNOWN. */ virtual PortableInterceptor::ReplyStatus reply_status ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// return the object reference to which the request was forwarded. virtual CORBA::Object_ptr forward_reference ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + void); virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + ); /// Return the IOP::ServiceContext with the given IOP::ServiceId /// from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Return the IOP::ServiceContext with the given IOP::ServiceId /// from the reply service context list. virtual IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. virtual CORBA::Object_ptr target ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the object reference for the current target. The target /// may change in the even of a location forward. virtual CORBA::Object_ptr effective_target ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); virtual IOP::TaggedProfile * effective_profile ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return an Any containing the received exception, if any. /// Otherwise, throw a CORBA::BAD_INV_ORDER exception. @@ -183,44 +165,38 @@ public: * @note There is no trivial way to extract the exception from an Any. */ virtual CORBA::Any * received_exception ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the repository ID for the received exception. virtual char * received_exception_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the first IOP::TaggedComponent that matches the given /// IOP::ComponentId in the object reference for the current /// target. virtual IOP::TaggedComponent * get_effective_component ( IOP::ComponentId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Return all IOP::TaggedComponent(s) that match the given /// IOP::ComponentId in the object reference for the current /// target. virtual IOP::TaggedComponentSeq * get_effective_components ( IOP::ComponentId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Return the policy of the given type in effect for the current /// request. virtual CORBA::Policy_ptr get_request_policy ( CORBA::PolicyType type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Add the IOP::ServiceContext to the request (outgoing) /// IOP::ServiceContextList. virtual void add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /* * Proprietary accessor methods for the FT retention ID and @@ -263,8 +239,7 @@ private: IOP::ServiceContext *get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); private: /// Pointer to the invocation object. diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index ba15a78da6f..70709e490fc 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -2,7 +2,6 @@ #include "tao/PI/ORBInitInfoC.h" #include "tao/PI/InterceptorC.h" -#include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "tao/debug.h" diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 5cfc907fd76..c7df519ef9d 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 7c9e5ae8645..217bfee7321 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -3,12 +3,12 @@ #include "tao/PI/ORBInitInfo.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" -#include "tao/SystemException.h" #include "tao/Object_Loader.h" #include "tao/PolicyFactory_Registry_Adapter.h" #include "ace/Dynamic_Service.h" #include "ace/Service_Config.h" +#include "ace/CORBA_macros.h" #if TAO_HAS_INTERCEPTORS == 1 #include "tao/PI/PICurrent.h" @@ -29,17 +29,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Traits specializations for TAO_ORBInitInfo. TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate ( - TAO_ORBInitInfo_ptr p - ) +TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate (TAO_ORBInitInfo_ptr p) { return TAO_ORBInitInfo::_duplicate (p); } void -TAO::Objref_Traits<TAO_ORBInitInfo>::release ( - TAO_ORBInitInfo_ptr p - ) +TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p) { ::CORBA::release (p); } @@ -77,7 +73,6 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void) CORBA::StringSeq * TAO_ORBInitInfo::arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -106,7 +101,6 @@ TAO_ORBInitInfo::arguments (void) char * TAO_ORBInitInfo::orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -117,7 +111,6 @@ TAO_ORBInitInfo::orb_id (void) IOP::CodecFactory_ptr TAO_ORBInitInfo::codec_factory (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->codec_factory_.in ())) { @@ -152,8 +145,6 @@ TAO_ORBInitInfo::register_initial_reference ( const char * id, CORBA::Object_ptr obj ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::InvalidName)) { this->check_validity (); @@ -173,8 +164,6 @@ CORBA::Object_ptr TAO_ORBInitInfo::resolve_initial_references ( const char * id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::InvalidName)) { this->check_validity (); @@ -193,8 +182,6 @@ void TAO_ORBInitInfo::add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName)) { # if TAO_HAS_INTERCEPTORS == 1 this->check_validity (); @@ -214,8 +201,6 @@ void TAO_ORBInitInfo::add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName)) { # if TAO_HAS_INTERCEPTORS == 1 this->check_validity (); @@ -236,8 +221,6 @@ void TAO_ORBInitInfo::add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName)) { this->check_validity (); @@ -250,9 +233,6 @@ TAO_ORBInitInfo::add_client_request_interceptor_with_policy ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)) { # if TAO_HAS_INTERCEPTORS == 1 this->check_validity (); @@ -276,9 +256,6 @@ TAO_ORBInitInfo::add_server_request_interceptor_with_policy ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)) { # if TAO_HAS_INTERCEPTORS == 1 this->check_validity (); @@ -303,9 +280,6 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)) { this->check_validity (); @@ -324,7 +298,6 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( PortableInterceptor::SlotId TAO_ORBInitInfo::allocate_slot_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -346,7 +319,6 @@ TAO_ORBInitInfo::register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -366,7 +338,6 @@ TAO_ORBInitInfo::register_policy_factory ( size_t TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 72c2cb20624..0b6976b7447 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -78,19 +78,16 @@ public: /// Return the argument vector for the ORB currently being /// initialized as a string sequence. virtual CORBA::StringSeq * arguments ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the ORBid for the ORB currently being initialized. virtual char * orb_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Return the CodecFactory for the ORB currently being /// initialized. virtual IOP::CodecFactory_ptr codec_factory ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Register a mapping between a string and a corresponding object /// reference with the ORB being initialized. @@ -105,86 +102,65 @@ public: virtual void register_initial_reference ( const char * id, CORBA::Object_ptr obj - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::InvalidName)); + ); /// Obtain a reference to an object that may not yet be available /// via the usual CORBA::ORB::resolve_initial_references() mechanism /// since the ORB may not be fully initialized yet. virtual CORBA::Object_ptr resolve_initial_references ( const char * id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::InvalidName)); + ); /// Register a client request interceptor with the ORB currently /// being initialized. virtual void add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName)); + ); /// Register a server request interceptor with the ORB currently /// being initialized. virtual void add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName)); + ); /// Register an IOR interceptor with the ORB currently being /// initialized. virtual void add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName)); + ); /// Register a client request interceptor with the ORB currently /// being initialized, along with a list of policies. virtual void add_client_request_interceptor_with_policy ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)); + ); /// Register a server request interceptor with the ORB currently /// being initialized, along with a list of policies. virtual void add_server_request_interceptor_with_policy ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)); + ); /// Register an IOR interceptor with the ORB currently being /// initialized, along with a list of policies. virtual void add_ior_interceptor_with_policy ( PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)); + ); /// Reserve a slot in table found within the /// PortableInterceptor::Current object. virtual PortableInterceptor::SlotId allocate_slot_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); /// Register a policy factory of the given policy type with the ORB /// currently being initialized. virtual void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ORB_ptr _get_orb ( void @@ -210,8 +186,7 @@ public: */ size_t allocate_tss_slot_id ( ACE_CLEANUP_FUNC cleanup - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Return a pointer to the ORB Core associated with the ORB being /// initialized. diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 3f43054c41a..21cde3a2648 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -8,11 +8,11 @@ #include "tao/ORB_Core.h" #include "tao/ORB_Constants.h" -#include "tao/SystemException.h" #include "ace/Static_Object_Lock.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Log_Msg.h" +#include "ace/CORBA_macros.h" ACE_RCSID (PI, ORBInitializer_Registry, diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 87f37f55389..11abf6d283e 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -6,6 +6,7 @@ #include "tao/PI/PI_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" #include "tao/ORB_Constants.h" +#include "ace/CORBA_macros.h" ACE_RCSID (PI, PI, diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 30e4c7ed372..8d66096a707 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -15,7 +15,7 @@ ACE_RCSID (tao, #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" #include "tao/TAO_Server_Request.h" -#include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -31,10 +31,7 @@ TAO::PICurrent::~PICurrent (void) } CORBA::Any * -TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) +TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier) { this->check_validity (identifier); @@ -43,10 +40,7 @@ TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier void TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier, - const CORBA::Any &data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) + const CORBA::Any &data) { this->check_validity (identifier); diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index 97985e1d80d..6d79beb9320 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -72,16 +72,12 @@ namespace TAO /// Retrieve information stored in the slot table at the given /// SlotId. virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + ); /// Set information in the slot table at the given SlotId. virtual void set_slot (PortableInterceptor::SlotId identifier, const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + ); //@} virtual CORBA::ORB_ptr _get_orb ( diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index e1b5a29c5cc..b8a773317cd 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -12,17 +12,14 @@ ACE_RCSID (tao, #endif /* __ACE_INLINE__ */ #include "tao/TAO_Server_Request.h" -#include "tao/SystemException.h" #include "ace/Log_Msg.h" #include "tao/debug.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Any * -TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) +TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier) { // No need to check validity of SlotId. It is validated before this // method is invoked. @@ -69,10 +66,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier void TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier, - const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) + const CORBA::Any & data) { // No need to check validity of SlotId. It is validated before this // method is invoked. diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index ec1c051f91e..e0a861978d4 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -59,16 +59,12 @@ namespace TAO /// Retrieve information stored in the slot table at the given /// SlotId. CORBA::Any *get_slot (PortableInterceptor::SlotId identifier - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + ); /// Set information in the slot table at the given SlotId. void set_slot (PortableInterceptor::SlotId identifier, const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + ); /// Logically/Lazy (shallow) copy the given object's slot table. void take_lazy_copy (PICurrent_Impl *p); diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index 7f5587703c4..0a24935b8df 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -33,7 +33,6 @@ TAO_PICurrent_Loader::create_object ( int, ACE_TCHAR *[] ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = CORBA::Object::_nil (); ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index 8b6e981c62c..f98478ff8c9 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -41,8 +41,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index 0bd6def0b1a..7bdbbea5343 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -8,6 +8,7 @@ #include "tao/PI/ProcessingModePolicyC.h" #include "tao/ORB_Core.h" #include "tao/PI/ORBInitInfoC.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -17,14 +18,12 @@ ACE_RCSID (tao, void TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The PI policy factory is stateless and reentrant, so share a // single instance between all ORBs. @@ -65,8 +64,7 @@ TAO_PI_ORBInitializer::register_policy_factories ( { try { - info->register_policy_factory (*i, - this->policy_factory_.in ()); + info->register_policy_factory (*i, this->policy_factory_.in ()); } catch (const ::CORBA::BAD_INV_ORDER& ex) { diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index f77777cafe6..f1be187d833 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -50,12 +50,10 @@ public: //@{ void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void post_init (PortableInterceptor::ORBInitInfo_ptr info - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); //@} diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp index 8fdf491ca59..ccb5a6a50da 100644 --- a/TAO/tao/PI/PI_PolicyFactory.cpp +++ b/TAO/tao/PI/PI_PolicyFactory.cpp @@ -4,6 +4,8 @@ #include "tao/PI/ProcessingModePolicy.h" #include "tao/ORB_Constants.h" +#include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -14,10 +16,7 @@ ACE_RCSID (tao, CORBA::Policy_ptr TAO_PI_PolicyFactory::create_policy ( CORBA::PolicyType type, - const CORBA::Any &value - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) + const CORBA::Any &value) { if (type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) { diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h index 17bd5d9bd0a..64ac4779504 100644 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ b/TAO/tao/PI/PI_PolicyFactory.h @@ -38,9 +38,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory public: CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index ed1a58f3ffe..b99583692aa 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -169,8 +169,6 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) ::CORBA::Policy_ptr PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE); } diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 6b1f0a47ecd..2e982ba7bad 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -42,8 +42,6 @@ #include "tao/PI/pi_export.h" #include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/Object.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" @@ -131,20 +129,13 @@ namespace PortableInterceptor const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::CORBA::PolicyError - )) = 0; + = 0; // Hand-crafted addition. virtual ::CORBA::Policy_ptr _create_policy ( CORBA::PolicyType type - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CORBA::PolicyError - )); + ); // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index 41a3fe70e3b..40ddc36cfa3 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -1,8 +1,8 @@ #include "tao/PI/PolicyFactory_Registry.h" #include "tao/PI/PolicyFactoryC.h" #include "tao/ORB_Constants.h" -#include "tao/SystemException.h" #include "tao/PolicyC.h" +#include "tao/SystemException.h" ACE_RCSID (PI, PolicyFactory_Registry, @@ -33,8 +33,7 @@ TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void) void TAO_PolicyFactory_Registry::register_policy_factory ( CORBA::PolicyType type, - PortableInterceptor::PolicyFactory_ptr policy_factory - ) + PortableInterceptor::PolicyFactory_ptr policy_factory) { if (CORBA::is_nil (policy_factory)) { @@ -48,8 +47,7 @@ TAO_PolicyFactory_Registry::register_policy_factory ( PortableInterceptor::PolicyFactory_ptr factory = PortableInterceptor::PolicyFactory::_duplicate (policy_factory); - const int result = this->factories_.bind (type, - factory); + const int result = this->factories_.bind (type, factory); if (result != 0) { diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index 18ceb0a92d4..ddfda4fee0a 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -26,7 +26,6 @@ #include "tao/PolicyFactory_Registry_Adapter.h" #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp index 9530a0956c2..0a5627af836 100644 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ b/TAO/tao/PI/ProcessingModePolicy.cpp @@ -5,6 +5,8 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "tao/PortableInterceptorC.h" +#include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -22,7 +24,6 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy CORBA::Policy_ptr TAO_ProcessingModePolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ProcessingModePolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -34,20 +35,17 @@ TAO_ProcessingModePolicy::copy (void) void TAO_ProcessingModePolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } PortableInterceptor::ProcessingMode TAO_ProcessingModePolicy::processing_mode (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return processing_mode_; } CORBA::PolicyType TAO_ProcessingModePolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE; } diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h index 0b6fbebbcbb..589a17b5334 100644 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ b/TAO/tao/PI/ProcessingModePolicy.h @@ -47,17 +47,13 @@ public: TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode); virtual PortableInterceptor::ProcessingMode processing_mode - (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); private: /// The attribute diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index e05c080d831..733bfff0e4b 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -11,6 +11,7 @@ #include "tao/ORB_Constants.h" #include "tao/StringSeqC.h" #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, RequestInfo_Util, diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index 240984f3b02..9cbc62cde5d 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -25,7 +25,6 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "ace/CORBA_macros.h" #include "tao/PI/pi_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 5c5c44e4fca..863b6eeca11 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -18,17 +18,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PortableServer_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_PortableServer_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { - this->register_policy_factories (info - ); + this->register_policy_factories (info); } void diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index e35324dcfb9..cdbcce827cc 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -40,11 +40,9 @@ public: * PortableInterceptor::ORBInitializer interface. */ //@{ - void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index 4ccec2811fc..e2a8d8665f9 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -21,8 +21,6 @@ CORBA::Policy_ptr TAO_PortableServer_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { #if !defined (CORBA_E_MICRO) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h index 40f95076ee6..c0d5a5037a3 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h @@ -32,9 +32,7 @@ class TAO_PortableServer_PolicyFactory { public: CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp index efbfd028419..2c7fcb81774 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.cpp +++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp @@ -6,6 +6,8 @@ #include "tao/PI_Server/ServerRequestDetails.inl" #endif /* defined INLINE */ +#include "tao/SystemException.h" + ACE_RCSID (PI_Server, ServerRequestDetails, "$Id$") diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 86f738fac4d..b7d6238660e 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong TAO::ServerRequestInfo::request_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The request ID returned by this method need not correspond to the // GIOP request ID sent with the client request. The request ID @@ -72,14 +71,12 @@ TAO::ServerRequestInfo::request_id (void) char * TAO::ServerRequestInfo::operation (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * TAO::ServerRequestInfo::arguments (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->args_ == 0) { @@ -118,7 +115,6 @@ TAO::ServerRequestInfo::arguments (void) Dynamic::ExceptionList * TAO::ServerRequestInfo::exceptions (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->args_ == 0) { @@ -149,21 +145,18 @@ TAO::ServerRequestInfo::exceptions (void) Dynamic::ContextList * TAO::ServerRequestInfo::contexts (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } Dynamic::RequestContext * TAO::ServerRequestInfo::operation_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } CORBA::Any * TAO::ServerRequestInfo::result (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->args_ == 0) { @@ -189,14 +182,12 @@ TAO::ServerRequestInfo::result (void) CORBA::Boolean TAO::ServerRequestInfo::response_expected (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_request_.response_expected (); } Messaging::SyncScope TAO::ServerRequestInfo::sync_scope (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.sync_with_server ()) return Messaging::SYNC_WITH_SERVER; @@ -206,7 +197,6 @@ TAO::ServerRequestInfo::sync_scope (void) PortableInterceptor::ReplyStatus TAO::ServerRequestInfo::reply_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.reply_status () == -1) // A reply hasn't been received yet. @@ -217,7 +207,6 @@ TAO::ServerRequestInfo::reply_status (void) CORBA::Object_ptr TAO::ServerRequestInfo::forward_reference (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD) throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); @@ -229,8 +218,6 @@ TAO::ServerRequestInfo::forward_reference (void) CORBA::Any * TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) { // Retrieve the total number of assigned slots from the PICurrent. // No TSS access is incurred. @@ -254,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) IOP::ServiceContext * TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context &service_context_list = this->server_request_.request_service_context (); @@ -264,7 +250,6 @@ TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id) IOP::ServiceContext * TAO::ServerRequestInfo::get_reply_service_context (IOP::ServiceId id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context & service_context_list = this->server_request_.reply_service_context (); @@ -277,7 +262,6 @@ TAO::ServerRequestInfo::get_service_context_i ( TAO_Service_Context & service_context_list, IOP::ServiceId id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; @@ -298,7 +282,6 @@ TAO::ServerRequestInfo::get_service_context_i ( // with the spec. CORBA::Any * TAO::ServerRequestInfo::sending_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION && this->server_request_.reply_status () != PortableInterceptor::USER_EXCEPTION) @@ -330,7 +313,6 @@ TAO::ServerRequestInfo::sending_exception (void) char * TAO::ServerRequestInfo::server_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) return @@ -341,7 +323,6 @@ TAO::ServerRequestInfo::server_id (void) char * TAO::ServerRequestInfo::orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) return @@ -352,7 +333,6 @@ TAO::ServerRequestInfo::orb_id (void) PortableInterceptor::AdapterName * TAO::ServerRequestInfo::adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The adapter_name attribute defines a name for the object adapter // that services requests for the invoked object. In the case of the @@ -368,7 +348,6 @@ TAO::ServerRequestInfo::adapter_name (void) PortableInterceptor::ObjectId * TAO::ServerRequestInfo::object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) { @@ -408,7 +387,6 @@ TAO::ServerRequestInfo::object_id (void) CORBA::OctetSeq * TAO::ServerRequestInfo::adapter_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) return this->servant_upcall_->poa ().id (); @@ -419,7 +397,6 @@ TAO::ServerRequestInfo::adapter_id (void) char * TAO::ServerRequestInfo::target_most_derived_interface ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::Servant const servant = (this->servant_upcall_ == 0 @@ -435,9 +412,7 @@ TAO::ServerRequestInfo::target_most_derived_interface ( } CORBA::Policy_ptr -TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type - ) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type) { if (this->servant_upcall_ != 0) { @@ -465,8 +440,6 @@ void TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, const CORBA::Any &data ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)) { // Retrieve the total number of assigned slots from the PICurrent // object. No TSS access is incurred. @@ -490,7 +463,6 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, CORBA::Boolean TAO::ServerRequestInfo::target_is_a (const char * id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Implemented in the generated skeleton. @@ -514,7 +486,6 @@ TAO::ServerRequestInfo::add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list TAO_Service_Context &service_context_list = diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index c19c6893f6f..d2be9d8e200 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -83,50 +83,34 @@ namespace TAO /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong request_id (void); /// Return the operation name for the current request. - virtual char * operation (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * operation (void); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::ParameterList * arguments (void); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::ExceptionList * exceptions (void); - virtual Dynamic::ContextList * contexts ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::ContextList * contexts (void); - virtual Dynamic::RequestContext * operation_context ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::RequestContext * operation_context (void); /// Return the result of the current request. If there is no /// return value then an @c Any with @c tk_void @c TypeCode is /// returned. This method is not valid for oneway operations. - virtual CORBA::Any * result ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Any * result (void); /// Returns @c true for a two-way operation, and @c false otherwise. - virtual CORBA::Boolean response_expected ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean response_expected (void); /// Return the @c sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// @c CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Messaging::SyncScope sync_scope (void); /// Return the reply status for the current request. /** @@ -134,37 +118,25 @@ namespace TAO * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD, * @c TRANSPORT_RETRY, @c UNKNOWN.. */ - virtual PortableInterceptor::ReplyStatus reply_status ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableInterceptor::ReplyStatus reply_status (void); /// If the reply status is /// @c PortableInterceptor::LOCATION_FORWARD return the /// object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + virtual CORBA::Object_ptr forward_reference (void); /// Retrieve data from the "request scope" @c PICurrent object. - virtual CORBA::Any * get_slot ( - PortableInterceptor::SlotId id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); /// Return the @c IOP::ServiceContext with the given /// @c IOP::ServiceId from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( - IOP::ServiceId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + IOP::ServiceId id); /// Return the @c IOP::ServiceContext with the given /// @c IOP::ServiceId from the reply service context list. virtual IOP::ServiceContext * get_reply_service_context ( - IOP::ServiceId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + IOP::ServiceId id); /// Return an @c Any containing the exception being sent, if any. /// Otherwise, throw a @c CORBA::BAD_INV_ORDER exception. @@ -172,69 +144,48 @@ namespace TAO * @note There is no trivial way to extract the exception from an * @c Any. */ - virtual CORBA::Any * sending_exception ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Any * sending_exception (void); /// Return the @c ObjectId for the target object. - virtual PortableInterceptor::ObjectId * object_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableInterceptor::ObjectId * object_id (void); /// Return the @c AdapterId for the POA handling the current /// request. - virtual CORBA::OctetSeq * adapter_id ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::OctetSeq * adapter_id (void); /// Return the server_id of the server. The value is passed to /// the ORB via @c -ORBServerId parameter. - virtual char * server_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * server_id (void); /// Return the ORBId value that is passed to the @c ORB_init /// call. - virtual char * orb_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * orb_id (void); /// Return the name of the object adapter that services requests /// for the invoked object. - virtual PortableInterceptor::AdapterName * adapter_name ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableInterceptor::AdapterName * adapter_name (void); /// Return the most derived interface of the target object. - virtual char * target_most_derived_interface ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * target_most_derived_interface (void); /// Return the policy of the given type in effect for the current /// request. - virtual CORBA::Policy_ptr get_server_policy ( - CORBA::PolicyType type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr get_server_policy (CORBA::PolicyType type); /// Insert data into the "request scope" @c PICurrent object. virtual void set_slot (PortableInterceptor::SlotId id, - const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::InvalidSlot)); + const CORBA::Any & data); /// Returns true if the target's type corresponds to the given /// @c RepositoryId. - virtual CORBA::Boolean target_is_a (const char * id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean target_is_a (const char * id); /// Add the @c IOP::ServiceContext to the reply (outgoing) /// @c IOP::ServiceContextList. virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); public: @@ -270,8 +221,7 @@ namespace TAO IOP::ServiceContext * get_service_context_i ( TAO_Service_Context & service_context_list, IOP::ServiceId id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); protected: diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 0414e800f56..bea14050e88 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -43,7 +43,6 @@ #include "tao/PI_Server/pi_server_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" @@ -155,10 +154,7 @@ namespace PortableInterceptor ::CORBA::OctetSeq_out os ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ForwardRequest - )) {} + {} #endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */ @@ -167,12 +163,8 @@ namespace PortableInterceptor virtual void receive_request_service_contexts ( ::PortableInterceptor::ServerRequestInfo_ptr ri - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ForwardRequest - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -181,10 +173,7 @@ namespace PortableInterceptor ::PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ForwardRequest - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -193,9 +182,7 @@ namespace PortableInterceptor ::PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -204,10 +191,7 @@ namespace PortableInterceptor ::PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ForwardRequest - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -216,10 +200,7 @@ namespace PortableInterceptor ::PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ForwardRequest - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index a321ccdb12c..d8bd6c86f20 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -404,9 +404,6 @@ TAO::Collocation_Proxy_Broker * CORBA::PolicyType CORBA::Policy::policy_type ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (!this->is_evaluated ()) { @@ -445,9 +442,6 @@ CORBA::PolicyType CORBA::Policy::policy_type ( ::CORBA::Policy_ptr CORBA::Policy::copy ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (!this->is_evaluated ()) { @@ -486,9 +480,6 @@ CORBA::PolicyType CORBA::Policy::policy_type ( void CORBA::Policy::destroy ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (!this->is_evaluated ()) { diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 829c4027622..e44ef0465a3 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -42,7 +42,6 @@ #include /**/ "tao/TAO_Export.h" #include "tao/ORB.h" -#include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" @@ -284,30 +283,21 @@ namespace CORBA virtual CORBA::PolicyType policy_type ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -429,9 +419,7 @@ namespace CORBA const ::CORBA::PolicyTypeSeq & ts ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -441,10 +429,7 @@ namespace CORBA ::CORBA::SetOverrideType set_add ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::CORBA::InvalidPolicies - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index af658e2db7a..0c8596949e4 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -23,9 +23,6 @@ #include "tao/Basic_Types.h" -#include "ace/CORBA_macros.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL //-- Forward Declarations-- diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp index f538b416258..de2f5008240 100644 --- a/TAO/tao/Policy_Current.cpp +++ b/TAO/tao/Policy_Current.cpp @@ -45,10 +45,7 @@ TAO_Policy_Current::get_policy ( } CORBA::PolicyList * -TAO_Policy_Current::get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts - ) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_Policy_Current::get_policy_overrides (const CORBA::PolicyTypeSeq & ts) { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -58,10 +55,7 @@ TAO_Policy_Current::get_policy_overrides ( void TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::InvalidPolicies)) + CORBA::SetOverrideType set_add) { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -69,13 +63,11 @@ TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies, } CORBA::Policy_ptr -TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type - ) +TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type) { TAO_Policy_Current_Impl &impl = this->implementation (); - return impl.get_cached_policy (type - ); + return impl.get_cached_policy (type); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h index 62bbd4e456b..142efa29cb4 100644 --- a/TAO/tao/Policy_Current.h +++ b/TAO/tao/Policy_Current.h @@ -61,16 +61,13 @@ public: virtual CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::InvalidPolicies)); + ); // = Set and get the implementation. TAO_Policy_Current_Impl &implementation (void) const; diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 2bc80902620..bf40e768f2e 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::PolicyList * TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.get_policy_overrides (ts); @@ -26,8 +25,6 @@ TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts) void TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::InvalidPolicies)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->impl_.set_policy_overrides (policies, set_add); diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 44b56684184..44565ba7a58 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -55,13 +55,10 @@ public: // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::PolicyTypeSeq & ts); virtual void set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::InvalidPolicies)); + CORBA::SetOverrideType set_add); private: diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 93f1a6beca9..9ef040f04b3 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -3,17 +3,16 @@ #include "tao/Policy_Set.h" #include "tao/SystemException.h" #include "tao/debug.h" +#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/Policy_Set.inl" #endif /* ! __ACE_INLINE__ */ - ACE_RCSID (tao, Policy_Set, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) @@ -83,8 +82,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) } void -TAO_Policy_Set::copy_from (TAO_Policy_Set *source - ) +TAO_Policy_Set::copy_from (TAO_Policy_Set *source) { if (source == 0) { @@ -146,8 +144,7 @@ TAO_Policy_Set::cleanup_i (void) // @@ !!! Add comments regarding Policy lifetimes, etc. void TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, - CORBA::SetOverrideType set_add - ) + CORBA::SetOverrideType set_add) { // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE) @@ -199,8 +196,7 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, } void -TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy - ) +TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy) { if (! this->compatible_scope (policy->_tao_scope())) { @@ -251,8 +247,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy } CORBA::PolicyList * -TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types - ) +TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { CORBA::ULong const slots = types.length (); CORBA::PolicyList *policy_list_ptr = 0; @@ -336,8 +331,7 @@ TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const } CORBA::Policy_ptr -TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type - ) +TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type) { if (type != TAO_CACHED_POLICY_UNCACHED && type < TAO_CACHED_POLICY_MAX_CACHED) diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index b666ff8bfde..fdb948bb7d3 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -18,14 +18,14 @@ #define TAO_POLICY_VALIDATOR_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/TAO_Export.h" -#include "tao/Basic_Types.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index d58ba68db7b..845c1bec8c9 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -2,13 +2,15 @@ #include "tao/PortableServer/Active_Object_Map.h" #include "tao/PortableServer/Active_Object_Map_Entry.h" -#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Active_Object_Map.inl" #endif /* __ACE_INLINE__ */ +#include "tao/SystemException.h" + #include "ace/Auto_Ptr.h" +#include "ace/CORBA_macros.h" ACE_RCSID(PortableServer, Active_Object_Map, diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 829acb189c5..16cec7c1071 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/Environment.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp index 91820c955f9..ef3c3cac095 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.cpp +++ b/TAO/tao/PortableServer/Adapter_Activator.cpp @@ -28,7 +28,6 @@ namespace TAO CORBA::Boolean Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Default policies CORBA::PolicyList default_policies; diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h index 71bff543e51..d5d648b8a3b 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.h +++ b/TAO/tao/PortableServer/Adapter_Activator.h @@ -45,8 +45,7 @@ namespace TAO Adapter_Activator (PortableServer::POAManager_ptr poa_manager); CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); protected: diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index 63e6773dac9..bdba9bcf3f2 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -7,6 +7,8 @@ ACE_RCSID(PortableServer, Default_Servant_Dispatcher, "$Id$") +#include "ace/CORBA_macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void) diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index f49f84a1d71..2c16f0dad5f 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -7,10 +7,9 @@ #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #include "tao/Abstract_Servant_Base.h" -#include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "tao/Object.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" ACE_RCSID (PortableServer, Direct_Collocation_Upcall_Wrapper, @@ -27,15 +26,12 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall ( const char * op, size_t op_len, TAO::Collocation_Strategy strategy) - ACE_THROW_SPEC ((CORBA::Exception)) { TAO_Abstract_ServantBase * const servant = obj->_servant (); TAO_Collocated_Skeleton collocated_skel; - int const status = servant->_find (op, collocated_skel, strategy, op_len); - - if (status == -1) + if (servant->_find (op, collocated_skel, strategy, op_len) == -1) { throw ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index e84fb58ade4..ca178c39e5a 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -27,7 +27,6 @@ #include "tao/Exception.h" #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -61,8 +60,7 @@ namespace TAO int num_args, const char * op, size_t op_len, - TAO::Collocation_Strategy strategy) - ACE_THROW_SPEC ((CORBA::Exception)); + TAO::Collocation_Strategy strategy); }; } // End namespace TAO diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index 619f02bc679..5e5c697efe6 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, IdAssignmentPolicy, "$Id$") +#include "ace/CORBA_macros.h" + #if !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +23,6 @@ namespace TAO CORBA::Policy_ptr IdAssignmentPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { IdAssignmentPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -33,20 +34,17 @@ namespace TAO void IdAssignmentPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::IdAssignmentPolicyValue IdAssignmentPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType IdAssignmentPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::ID_ASSIGNMENT_POLICY_ID; } diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index cf9db21a4f1..b46b3746bdf 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::IdAssignmentPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::IdAssignmentPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index 4949af6817b..f0096d44855 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, IdUniquenessPolicy, "$Id$") +#include "ace/CORBA_macros.h" + #if !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +23,6 @@ namespace TAO CORBA::Policy_ptr IdUniquenessPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { IdUniquenessPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -33,20 +34,17 @@ namespace TAO void IdUniquenessPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::IdUniquenessPolicyValue IdUniquenessPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType IdUniquenessPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::ID_UNIQUENESS_POLICY_ID; } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 944738e6b94..04335db05e9 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::IdUniquenessPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::IdUniquenessPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index 2f5bef0c049..70be6e3c5d2 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -23,9 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" #include "tao/orbconf.h" -#include "tao/Environment.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index 287d32547e0..6d3a91be8fb 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, ImplicitActivationPolicy, "$Id$") +#include "ace/CORBA_macros.h" + #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +23,6 @@ namespace TAO CORBA::Policy_ptr ImplicitActivationPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ImplicitActivationPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -33,20 +34,17 @@ namespace TAO void ImplicitActivationPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::ImplicitActivationPolicyValue ImplicitActivationPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType ImplicitActivationPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; } diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index 50f1465a0c5..a53dad9fcc3 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::ImplicitActivationPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::ImplicitActivationPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index 32d14ed4fe0..d478bece27d 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -5,6 +5,8 @@ ACE_RCSID (PortableServer, LifespanPolicy, "$Id$") +#include "ace/CORBA_macros.h" + #if !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +23,6 @@ namespace TAO CORBA::Policy_ptr LifespanPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { LifespanPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -33,20 +34,17 @@ namespace TAO void LifespanPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::LifespanPolicyValue LifespanPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType LifespanPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::LIFESPAN_POLICY_ID; } diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index 50c3246bc08..78b7be973fa 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: LifespanPolicy (::PortableServer::LifespanPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::LifespanPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::LifespanPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 3ddbc63ac6b..96918af52df 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -20,7 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" #include "tao/PI_ForwardC.h" #include "ace/Service_Object.h" #include "ace/Array_Base.h" @@ -86,19 +85,11 @@ namespace TAO * * Methods required by the * PortableInterceptor::ObjectReferenceFactory ValueType. - * - * @todo - * @@ Johnny, we won't be needing the exception specification - * below for long. Once bug 1852 is fixed, we can the - * exception specification and the "tao/SystemException.h" - * include above. */ //@{ virtual CORBA::Object_ptr make_object ( const char * repository_id, - const PortableInterceptor::ObjectId & id - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + const PortableInterceptor::ObjectId & id) = 0; //@} }; diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 0a0777bc6ab..9a09c7e9f1b 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -3,6 +3,7 @@ // $Id$ #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -50,37 +51,29 @@ TAO_Object_Adapter::transient_poa_name_size () } ACE_INLINE int -TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key - ) +TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (-1); - return this->locate_servant_i (key - ); + return this->locate_servant_i (key); } ACE_INLINE TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key, - PortableServer::Servant &servant - ) + PortableServer::Servant &servant) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND); - return this->find_servant_i (key, - servant - ); + return this->find_servant_i (key, servant); } ACE_INLINE int TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name, - TAO_Root_POA *&poa - ) + TAO_Root_POA *&poa) { - return this->hint_strategy_->find_persistent_poa (system_name, - poa - ); + return this->hint_strategy_->find_persistent_poa (system_name, poa); } ACE_INLINE int @@ -93,9 +86,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, { if (activate_it) { - return this->find_persistent_poa (system_name, - poa - ); + return this->find_persistent_poa (system_name, poa); } else { diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 6625cb3743c..b6e0766e3e8 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -54,15 +54,12 @@ TAO_POA_Manager::~TAO_POA_Manager (void) char * TAO_POA_Manager::get_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->id_.in ()); } void TAO_POA_Manager::activate_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) { // This operation changes the state of the POA manager to active. If // issued while the POA manager is in the inactive state, the @@ -93,8 +90,6 @@ TAO_POA_Manager::activate_i (void) void TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), @@ -163,7 +158,6 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, void TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::AdapterState adapter_state = static_cast<PortableInterceptor::AdapterState> (state); @@ -182,8 +176,6 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat void TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), @@ -235,8 +227,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion) void TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index e2935dd6023..8f46f7f56ab 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -62,33 +62,23 @@ class TAO_PortableServer_Export TAO_POA_Manager : public: - void activate (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + void activate (void); #if (TAO_HAS_MINIMUM_POA == 0) - void hold_requests (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + void hold_requests (CORBA::Boolean wait_for_completion); void discard_requests (CORBA::Boolean wait_for_completion - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + ); void deactivate (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + CORBA::Boolean wait_for_completion); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAManager::State get_state (void); - char *get_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char *get_id (void); TAO_POA_Manager (TAO_Object_Adapter &object_adapter, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -104,8 +94,7 @@ public: /// Check the state of this POA manager void check_state (void); - PortableServer::POAManager::State get_state_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAManager::State get_state_i (); virtual CORBA::ORB_ptr _get_orb (void); @@ -115,29 +104,20 @@ public: protected: - void activate_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + void activate_i (void); void deactivate_i (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + CORBA::Boolean wait_for_completion); /// Method needed for notifying the IORInterceptors that the state /// of POAManager changed. - void adapter_manager_state_changed (PortableServer::POAManager::State state) - ACE_THROW_SPEC ((CORBA::SystemException)); + void adapter_manager_state_changed (PortableServer::POAManager::State state); #if (TAO_HAS_MINIMUM_POA == 0) - void hold_requests_i (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + void hold_requests_i (CORBA::Boolean wait_for_completion); - void discard_requests_i (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)); + void discard_requests_i (CORBA::Boolean wait_for_completion); #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index cfbdb77cd85..066b1112a38 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -2,8 +2,8 @@ // // $Id$ -#include "tao/Environment.h" #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -15,11 +15,7 @@ TAO_POA_Manager::lock (void) ACE_INLINE void TAO_POA_Manager::activate (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->activate_i (); } @@ -28,22 +24,14 @@ TAO_POA_Manager::activate (void) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->hold_requests_i (wait_for_completion); } ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->discard_requests_i (wait_for_completion); } @@ -51,11 +39,7 @@ TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion) ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->deactivate_i (etherealize_objects, wait_for_completion); } @@ -64,14 +48,12 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, ACE_INLINE PortableServer::POAManager::State TAO_POA_Manager::get_state_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->state_; } ACE_INLINE PortableServer::POAManager::State TAO_POA_Manager::get_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_); diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp index 62606565686..eb3a8ef823f 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.cpp +++ b/TAO/tao/PortableServer/POAManagerFactory.cpp @@ -4,6 +4,7 @@ #include "tao/PortableServer/POAManager.h" #include "ace/OS_NS_string.h" +#include "ace/CORBA_macros.h" ACE_RCSID (PortableServer, POAManagerFactory, @@ -28,9 +29,6 @@ TAO_POAManager_Factory::create_POAManager ( const char * id, const ::CORBA::PolicyList & policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - ::PortableServer::POAManagerFactory::ManagerAlreadyExists, - ::CORBA::PolicyError)) { // Validate the policy. TAO_POA_Policy_Set tao_policies (TAO_POA_Policy_Set (this->object_adapter_.default_poa_policies ())); @@ -82,7 +80,6 @@ TAO_POAManager_Factory::create_POAManager ( ::PortableServer::POAManagerFactory::POAManagerSeq * TAO_POAManager_Factory::list (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers; CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong> @@ -109,7 +106,6 @@ TAO_POAManager_Factory::list (void) ::PortableServer::POAManager_ptr TAO_POAManager_Factory::find (const char * id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ::PortableServer::POAManager_ptr poamanager = ::PortableServer::POAManager::_nil(); diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h index 62d4830b10c..fe6ad4c46ed 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.h +++ b/TAO/tao/PortableServer/POAManagerFactory.h @@ -49,16 +49,11 @@ public: virtual ::PortableServer::POAManager_ptr create_POAManager ( const char * id, - const ::CORBA::PolicyList & policies) - ACE_THROW_SPEC ((CORBA::SystemException, - ::PortableServer::POAManagerFactory::ManagerAlreadyExists, - ::CORBA::PolicyError)); + const ::CORBA::PolicyList & policies); - virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void); - virtual ::PortableServer::POAManager_ptr find (const char * id ) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::PortableServer::POAManager_ptr find (const char * id); void remove_all_poamanagers (void); diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index 1afa61544d3..defd9558ce1 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -19,8 +19,6 @@ namespace TAO { PortableServer::POA_ptr POA_Current::get_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)) { POA_Current_Impl *impl = this->implementation (); @@ -31,8 +29,6 @@ namespace TAO PortableServer::ObjectId * POA_Current::get_object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)) { POA_Current_Impl *impl = this->implementation (); @@ -43,8 +39,6 @@ namespace TAO PortableServer::Servant POA_Current::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)) { POA_Current_Impl *impl = this->implementation (); @@ -55,8 +49,6 @@ namespace TAO CORBA::Object_ptr POA_Current::get_reference (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)) { POA_Current_Impl *impl = this->implementation (); diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 57a97f0e37e..204190abccd 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -48,18 +48,14 @@ namespace TAO * Can raise the @c NoContext exception if this function is * not invoked in the context of an upcall. */ - PortableServer::POA_ptr get_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)); + PortableServer::POA_ptr get_POA (void); /** * Returns the object id of the current request being invoked. Can * raise the @c NoContext exception if this function is not * invoked in the context of an upcall. */ - PortableServer::ObjectId *get_object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)); + PortableServer::ObjectId *get_object_id (void); /** * This operation returns a locally manufactured reference to the object @@ -70,18 +66,14 @@ namespace TAO * Object::is_equivalent operation to compare the two references may not * necessarily return true. */ - CORBA::Object_ptr get_reference (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)); + CORBA::Object_ptr get_reference (void); /** * Returns a reference to the servant that hosts the object in whose * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised */ - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)); + PortableServer::Servant get_servant (void); /// Returns the class that implements this interface. POA_Current_Impl *implementation (void); diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index 5656041765c..baefc206285 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -9,9 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Object_ptr TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, int, - ACE_TCHAR * [] - ) - ACE_THROW_SPEC ((CORBA::SystemException)) + ACE_TCHAR * []) { TAO::Portable_Server::POA_Current* adapter = 0; ACE_NEW_RETURN (adapter, diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index bc0f3a9d7e4..28087757bde 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -34,8 +34,7 @@ public: /// Creates a PICurrent and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv []) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv []); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h index 53f39fc7686..2757259f5d8 100644 --- a/TAO/tao/PortableServer/POA_Guard.h +++ b/TAO/tao/PortableServer/POA_Guard.h @@ -19,9 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Environment.h" +#include "tao/orbconf.h" #include "ace/Guard_T.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 4d4aa7d4ddc..592be9ab1e9 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -42,7 +42,6 @@ #include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/Objref_VarOut_T.h" #include "tao/OctetSeqC.h" diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 38d9d2ffe71..1cecf8b3974 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -262,7 +262,6 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy ( CORBA::Object_ptr obj ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Collocation_Strategy strategy = TAO_ORB_Core::collocation_strategy (obj); @@ -281,7 +280,6 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch ( TAO::Collocation_Strategy strategy ) - ACE_THROW_SPEC ((CORBA::Exception)) { TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper; collocation_upcall_wrapper.upcall ( @@ -346,9 +344,6 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type ( int ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () = dynamic_cast<POA_CORBA::Policy_ptr> @@ -367,9 +362,6 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy ( int ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () = dynamic_cast<POA_CORBA::Policy_ptr> @@ -386,11 +378,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy ( TAO_Abstract_ServantBase *servant, TAO::Argument **, int - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { dynamic_cast<POA_CORBA::Policy_ptr> (servant) diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 4f6a78dc428..5158592f1c4 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -146,9 +146,7 @@ namespace POA_CORBA virtual CORBA::PolicyType policy_type ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; static void _get_policy_type_skel ( TAO_ServerRequest & server_request, @@ -163,9 +161,7 @@ namespace POA_CORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; static void copy_skel ( TAO_ServerRequest & server_request, @@ -180,9 +176,7 @@ namespace POA_CORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; static void destroy_skel ( TAO_ServerRequest & server_request, @@ -211,8 +205,7 @@ namespace POA_CORBA get_strategy ( CORBA::Object_ptr obj - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void dispatch ( @@ -224,8 +217,7 @@ namespace POA_CORBA size_t op_len, TAO::Collocation_Strategy strategy - ) - ACE_THROW_SPEC ((CORBA::Exception)); + ); static _TAO_Policy_Strategized_Proxy_Broker * the_TAO_Policy_Strategized_Proxy_Broker (void); @@ -260,10 +252,7 @@ namespace POA_CORBA TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 @@ -274,10 +263,7 @@ namespace POA_CORBA TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 @@ -288,10 +274,7 @@ namespace POA_CORBA TAO::Argument ** args, int num_args - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; // diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 6424524af08..ef5c094ce39 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -92,30 +92,21 @@ namespace POA_CORBA CORBA::PolicyType policy_type ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Policy_ptr copy ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( void - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: T *ptr_; diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl index c896883e321..12d3f23e7cb 100644 --- a/TAO/tao/PortableServer/PolicyS_T.inl +++ b/TAO/tao/PortableServer/PolicyS_T.inl @@ -128,9 +128,6 @@ template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ptr_->policy_type ( @@ -142,11 +139,7 @@ CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type ( template <class T> ACE_INLINE ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ptr_->copy ( @@ -160,9 +153,6 @@ template <class T> ACE_INLINE void POA_CORBA::Policy_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->ptr_->destroy ( diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index 90ab76fe374..6381ccf9bd2 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -14,14 +14,13 @@ #define TAO_POLICY_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Environment.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 0aa05f9f33d..a1184f34572 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -50,8 +50,7 @@ public: virtual ~TAO_Regular_POA (void); - PortableServer::POA_ptr the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr the_parent (void); protected: virtual void remove_from_parent_i (void); diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index bbfe8339c0e..a97a96b8471 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::POA_ptr TAO_Regular_POA::the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->parent_); } diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index 99e04676cbb..3a1f478abc6 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -23,7 +23,6 @@ namespace TAO CORBA::Policy_ptr RequestProcessingPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { RequestProcessingPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -35,20 +34,17 @@ namespace TAO void RequestProcessingPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::RequestProcessingPolicyValue RequestProcessingPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType RequestProcessingPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::REQUEST_PROCESSING_POLICY_ID; } diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index f9783203f29..d28b27a30b8 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::RequestProcessingPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::RequestProcessingPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index fa8fdc6f861..2d515d52f87 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -67,24 +67,20 @@ namespace TAO virtual PortableServer::ServantManager_ptr get_servant_manager ( void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual void set_servant (PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, @@ -111,18 +107,14 @@ namespace TAO virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual void etherealize_objects (CORBA::Boolean etherealize_objects) = 0; virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 00820d38a9d..4ee454e9b61 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -25,8 +25,6 @@ namespace TAO PortableServer::ServantManager_ptr RequestProcessingStrategyAOMOnly::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -34,8 +32,6 @@ namespace TAO void RequestProcessingStrategyAOMOnly::set_servant_manager ( PortableServer::ServantManager_ptr /*imgr*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -43,8 +39,6 @@ namespace TAO void RequestProcessingStrategyAOMOnly::set_servant ( PortableServer::Servant /*servant*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -53,8 +47,6 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyAOMOnly::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -101,9 +93,6 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyAOMOnly::id_to_servant ( const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { return this->poa_->user_id_to_servant_i (id); } @@ -140,9 +129,6 @@ namespace TAO PortableServer::ObjectId * RequestProcessingStrategyAOMOnly::servant_to_id ( PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { return this->poa_->servant_to_user_id (servant); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 69555e2a84d..96d79641ce9 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -43,28 +43,20 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ServantManager_ptr - get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + get_servant_manager (void); void set_servant_manager (PortableServer::ServantManager_ptr imgr - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); void set_servant (PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::Servant - get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + get_servant (void); virtual TAO_SERVANT_LOCATION @@ -87,10 +79,7 @@ namespace TAO virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual void cleanup_servant ( PortableServer::Servant servant, @@ -101,10 +90,7 @@ namespace TAO virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 4da60d19159..2b18dd7ff53 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -36,8 +36,6 @@ namespace TAO PortableServer::ServantManager_ptr RequestProcessingStrategyDefaultServant::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -45,16 +43,12 @@ namespace TAO void RequestProcessingStrategyDefaultServant::set_servant_manager ( PortableServer::ServantManager_ptr /*imgr*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } PortableServer::Servant RequestProcessingStrategyDefaultServant::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // This operation returns the default servant associated with the // POA. @@ -65,8 +59,6 @@ namespace TAO RequestProcessingStrategyDefaultServant::set_servant ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // This operation registers the specified servant with the POA as // the default servant. This servant will be used for all requests @@ -171,9 +163,6 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyDefaultServant::id_to_servant ( const PortableServer::ObjectId & /*id*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->default_servant_.in (); @@ -224,9 +213,6 @@ namespace TAO RequestProcessingStrategyDefaultServant::servant_to_id ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant default_servant = this->default_servant_.in (); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 53b8fea0084..f536a91a970 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -44,25 +44,17 @@ namespace TAO virtual void strategy_cleanup(void); PortableServer::ServantManager_ptr - get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + get_servant_manager (void); void set_servant_manager ( PortableServer::ServantManager_ptr imgr - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant (void); void set_servant ( PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, @@ -83,10 +75,7 @@ namespace TAO virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId &id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual void cleanup_servant ( PortableServer::Servant servant, @@ -97,10 +86,7 @@ namespace TAO virtual PortableServer::ObjectId *servant_to_id ( PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index fd86bc09d46..2729e7c0cc6 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -42,8 +42,6 @@ namespace TAO PortableServer::ServantManager_ptr RequestProcessingStrategyServantActivator::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ()); } @@ -51,8 +49,6 @@ namespace TAO void RequestProcessingStrategyServantActivator::set_servant_manager ( PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // This operation sets the default servant manager associated with the // POA. This operation may only be invoked once after a POA has been diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 0bff114eb4c..7b4504180bf 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -40,14 +40,10 @@ namespace TAO virtual void strategy_cleanup(void); - PortableServer::ServantManager_ptr get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::ServantManager_ptr get_servant_manager (void); void set_servant_manager (PortableServer::ServantManager_ptr imgr - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 6f9d111df4a..07b9b25853d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -40,8 +40,6 @@ namespace TAO PortableServer::ServantManager_ptr RequestProcessingStrategyServantLocator::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ()); } @@ -49,8 +47,6 @@ namespace TAO void RequestProcessingStrategyServantLocator::set_servant_manager ( PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // This operation sets the default servant manager associated with the // POA. This operation may only be invoked once after a POA has been diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 05426727ba1..534f183a3bd 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -40,13 +40,9 @@ namespace TAO virtual void strategy_cleanup(void); - PortableServer::ServantManager_ptr get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::ServantManager_ptr get_servant_manager (void); - void set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 71366a29c94..2be69725f9b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -25,27 +25,20 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyServantManager::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } void RequestProcessingStrategyServantManager::set_servant ( - PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) + PortableServer::Servant) { - ACE_UNUSED_ARG (servant); - throw PortableServer::POA::WrongPolicy (); } void RequestProcessingStrategyServantManager::validate_servant_manager ( - PortableServer::ServantManager_ptr servant_manager - ) + PortableServer::ServantManager_ptr servant_manager) { // When no servant manager is set, give an exception with minor code 4, // see 11.3.8.6 of the corba spec @@ -65,9 +58,6 @@ namespace TAO PortableServer::ObjectId * RequestProcessingStrategyServantManager::servant_to_id ( PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { return this->poa_->servant_to_user_id (servant); } @@ -75,9 +65,6 @@ namespace TAO PortableServer::Servant RequestProcessingStrategyServantManager::id_to_servant ( const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { return this->poa_->user_id_to_servant_i (id); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index d69ceed12ef..8a6c09546a1 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -37,13 +37,9 @@ namespace TAO public: RequestProcessingStrategyServantManager (void); - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant (void); - void set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant (PortableServer::Servant servant); void validate_servant_manager ( PortableServer::ServantManager_ptr servant_manager @@ -53,16 +49,10 @@ namespace TAO const PortableServer::ObjectId &system_id); virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + const PortableServer::ObjectId &id); virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant servant); virtual ::PortableServer::RequestProcessingPolicyValue type() const; }; diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 379e991d2f8..0de7c51671d 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -41,7 +41,6 @@ #include "tao/Server_Strategy_Factory.h" #include "tao/Acceptor_Registry.h" #include "tao/Thread_Lane_Resources.h" -#include "tao/Environment.h" #include "tao/Exception.h" #include "tao/Stub.h" #include "tao/Profile.h" @@ -81,7 +80,6 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = { PortableServer::ThreadPolicy_ptr TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::ThreadPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -97,7 +95,6 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value) PortableServer::LifespanPolicy_ptr TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::LifespanPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -112,7 +109,6 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::IdUniquenessPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -126,7 +122,6 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::IdAssignmentPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -141,7 +136,6 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal PortableServer::ImplicitActivationPolicy_ptr TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::ImplicitActivationPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -153,7 +147,6 @@ TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivat PortableServer::ServantRetentionPolicy_ptr TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::ServantRetentionPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -165,7 +158,6 @@ TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionP PortableServer::RequestProcessingPolicy_ptr TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::RequestProcessingPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -364,9 +356,6 @@ PortableServer::POA_ptr TAO_Root_POA::create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)) { // Initialize a TAO_POA_Policy_Set instance so that it contains the // default POA policies. @@ -474,9 +463,6 @@ PortableServer::POA_ptr TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)) { // This operaton creates a new POA as a child of the target POA. The // specified name identifies the new POA with respect to other POAs @@ -556,8 +542,6 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, PortableServer::POA_ptr TAO_Root_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -572,8 +556,6 @@ TAO_Root_POA::find_POA (const char *adapter_name, TAO_Root_POA * TAO_Root_POA::find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)) { TAO_Root_POA *child = 0; int result = this->children_.find (child_name, @@ -659,9 +641,6 @@ PortableServer::POA_ptr TAO_Root_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -674,9 +653,6 @@ TAO_Root_POA::create_POA (const char *adapter_name, PortableServer::ObjectId * TAO_Root_POA::servant_to_id (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { // If we had upgradeable locks, this would initially be a read lock // @@ -688,9 +664,6 @@ TAO_Root_POA::servant_to_id (PortableServer::Servant servant) PortableServer::ObjectId * TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> servant_to_user_id (servant); @@ -698,10 +671,6 @@ TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant) PortableServer::Servant TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -711,9 +680,6 @@ TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference) CORBA::Object_ptr TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); @@ -722,7 +688,6 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) PortableServer::POAList * TAO_Root_POA::the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -733,9 +698,6 @@ TAO_Root_POA::the_children (void) PortableServer::Servant TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -745,9 +707,6 @@ TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid) CORBA::Object_ptr TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -759,7 +718,6 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid) CORBA::Object_ptr TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id, const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); @@ -773,7 +731,6 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id, void TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO::Portable_Server::POA_Guard poa_guard (*this , 0); @@ -792,7 +749,6 @@ TAO_Root_POA::remove_from_parent_i (void) void TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->cleanup_in_progress_) return; @@ -969,7 +925,6 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child) PortableServer::POAList * TAO_Root_POA::the_children_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList_var children; CORBA::ULong child_current = static_cast <CORBA::ULong> @@ -994,7 +949,6 @@ TAO_Root_POA::the_children_i (void) PortableInterceptor::AdapterName * TAO_Root_POA::adapter_name_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The adapter name is the sequence of names starting from the // RootPOA to the one whose name is requested. The name of the @@ -1052,7 +1006,6 @@ TAO_Root_POA::adapter_name_i (void) void TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile, const IOP::TaggedComponent &component) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles. const CORBA::ULong profile_count = mprofile.profile_count (); @@ -1070,7 +1023,6 @@ TAO_Root_POA::add_ior_component_to_profile ( TAO_MProfile & mprofile, const IOP::TaggedComponent &component, IOP::ProfileId profile_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles matching the given // ProfileId. @@ -1101,7 +1053,6 @@ void TAO_Root_POA::adapter_state_changed ( const TAO::ORT_Array &array_obj_ref_template, PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IORInterceptor_Adapter *ior_adapter = this->orb_core_.ior_interceptor_adapter (); @@ -1116,9 +1067,6 @@ PortableServer::ObjectId * TAO_Root_POA::activate_object_i (PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> activate_object (servant, @@ -1128,9 +1076,6 @@ TAO_Root_POA::activate_object_i (PortableServer::Servant servant, PortableServer::ObjectId * TAO_Root_POA::activate_object (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { while (1) { @@ -1158,10 +1103,6 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant) void TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { while (1) { @@ -1192,10 +1133,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { this->active_policy_strategies_.servant_retention_strategy()-> activate_object_with_id (id, @@ -1208,8 +1145,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, void TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->deactivate_all_objects_i (etherealize_objects); @@ -1272,8 +1207,6 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core void TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->active_policy_strategies_.request_processing_strategy ()-> etherealize_objects (etherealize_objects); @@ -1284,9 +1217,6 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects) void TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -1297,9 +1227,6 @@ TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid) void TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { this->active_policy_strategies_.servant_retention_strategy()-> deactivate_object (id); @@ -1313,8 +1240,6 @@ TAO_Root_POA::is_persistent (void) const CORBA::Object_ptr TAO_Root_POA::create_reference (const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); @@ -1326,8 +1251,6 @@ TAO_Root_POA::create_reference (const char *intf) CORBA::Object_ptr TAO_Root_POA::create_reference_i (const char *intf, CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { if (!this->has_system_id ()) { @@ -1341,7 +1264,6 @@ TAO_Root_POA::create_reference_i (const char *intf, CORBA::Object_ptr TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id, const PortableServer::ObjectId & id) - ACE_THROW_SPEC ((CORBA::SystemException)) { const PortableInterceptor::ObjectId &user_oid = reinterpret_cast <const PortableInterceptor::ObjectId &>(id); @@ -1363,7 +1285,6 @@ CORBA::Object_ptr TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, const char *intf, CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If the POA has the SYSTEM_ID policy and it detects that the // Object Id value was not generated by the system or for this POA, @@ -1386,9 +1307,6 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i PortableServer::ObjectId * TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.request_processing_strategy()-> servant_to_id (servant); @@ -1396,9 +1314,6 @@ TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant) CORBA::Object_ptr TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> servant_to_reference (servant); @@ -1406,10 +1321,6 @@ TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant) PortableServer::Servant TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { // Make sure that the reference is valid. if (CORBA::is_nil (reference)) @@ -1490,9 +1401,6 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference, PortableServer::ObjectId * TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { // Make sure that the reference is valid. if (CORBA::is_nil (reference)) @@ -1551,9 +1459,6 @@ TAO_Root_POA::cleanup_servant ( PortableServer::Servant TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = @@ -1582,9 +1487,6 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id PortableServer::Servant TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> user_id_to_servant (id); @@ -1594,9 +1496,6 @@ CORBA::Object_ptr TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id, bool indirect ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.servant_retention_strategy()-> id_to_reference (id, indirect); @@ -1604,7 +1503,6 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id, CORBA::OctetSeq * TAO_Root_POA::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::OctetSeq *id = 0; ACE_NEW_THROW_EX (id, @@ -2407,7 +2305,6 @@ TAO_Root_POA::ORT_adapter_i (void) PortableServer::AdapterActivator_ptr TAO_Root_POA::the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ()); @@ -2418,7 +2315,6 @@ TAO_Root_POA::the_activator (void) void TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -2432,8 +2328,6 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa PortableServer::ServantManager_ptr TAO_Root_POA::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); @@ -2444,8 +2338,6 @@ TAO_Root_POA::get_servant_manager (void) void TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -2456,8 +2348,6 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr) PortableServer::Servant TAO_Root_POA::get_servant_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { return this->active_policy_strategies_.request_processing_strategy()-> get_servant (); @@ -2465,9 +2355,6 @@ TAO_Root_POA::get_servant_i (void) PortableServer::Servant TAO_Root_POA::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -2501,8 +2388,6 @@ TAO_Root_POA::get_servant (void) void TAO_Root_POA::set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -2626,7 +2511,6 @@ TAO_Root_POA::root (void) const TAO::ORT_Adapter * TAO_Root_POA::ORT_adapter (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->ort_adapter_ != 0) return this->ort_adapter_; @@ -2711,7 +2595,6 @@ TAO_Root_POA::imr_client_adapter_name (void) PortableServer::POAManager_ptr TAO_Root_POA::the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } @@ -2719,7 +2602,6 @@ TAO_Root_POA::the_POAManager (void) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr TAO_Root_POA::the_POAManagerFactory (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_); } diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index d7d69bfb6e3..8a046576f3f 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -131,53 +131,43 @@ public: PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)); + ); PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)); + ); #endif void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); #endif #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); #endif #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); #endif #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -185,51 +175,42 @@ public: create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * the_name (void); - PortableServer::POA_ptr the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr the_parent (void); PortableServer::POAList *the_children ( void - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); PortableServer::POAManager_ptr the_POAManager ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr the_POAManagerFactory ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); #endif /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::AdapterName *adapter_name (void); /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles. @@ -245,115 +226,68 @@ public: #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr the_activator ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); PortableServer::ServantManager_ptr get_servant_manager ( - void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void); void set_servant_manager (PortableServer::ServantManager_ptr imgr - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant (void); void set_servant (PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + ); #if !defined (CORBA_E_MICRO) void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + ); #endif void deactivate_object (const PortableServer::ObjectId &oid - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr create_reference (const char *intf - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); PortableServer::Servant reference_to_servant ( CORBA::Object_ptr reference - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); + ); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); + ); PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); - CORBA::OctetSeq *id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::OctetSeq *id (void); /// Accessor for POA policies. TAO_POA_Policy_Set &policies (void); @@ -491,10 +425,7 @@ public: bool &wait_occurred_restart_call); void deactivate_object_i (const PortableServer::ObjectId &oid - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); CORBA::Boolean is_persistent (void) const; @@ -549,23 +480,14 @@ public: CORBA::Short priority, bool &wait_occurred_restart_call - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid, bool indirect - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); TAO_SYNCH_CONDITION &servant_deactivation_condition (void); @@ -577,10 +499,7 @@ public: int delete_child (const String &child); PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::ORB_ptr _get_orb ( @@ -630,63 +549,49 @@ protected: PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)); + ); PortableServer::POA_ptr create_POA_i (const String &adapter_name, PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)); + ); TAO_Root_POA *find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)); + ); #endif void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void complete_destruction_i (void); - PortableServer::POAList *the_children_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAList *the_children_i (void); /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::AdapterName *adapter_name_i (void); /// Method to notify the IOR Interceptors when there is a state /// changed not related to POAManager. void adapter_state_changed ( const TAO::ORT_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Add the given tagged component to all profiles. void add_ior_component (TAO_MProfile & mprofile, const IOP::TaggedComponent & component - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Add the given tagged component to all profiles matching the given /// ProfileId. void add_ior_component_to_profile (TAO_MProfile & mprofile, const IOP::TaggedComponent & component, IOP::ProfileId profile_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Wrapper for the ORB's key_to_object that will alter the object pointer /// if the ImplRepo is used. @@ -711,9 +616,7 @@ protected: TAO_Acceptor_Registry &acceptor_registry ); - PortableServer::Servant get_servant_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant_i (void); protected: #if !defined (CORBA_E_MICRO) @@ -721,63 +624,42 @@ protected: PortableServer::Servant p_servant, CORBA::Short priority, bool &wait_occurred_restart_call - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + ); #endif virtual void remove_from_parent_i (void); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); void wait_for_completions (CORBA::Boolean wait_for_completion ); CORBA::Object_ptr create_reference_i (const char *intf, CORBA::Short priority - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr create_reference_with_id_i ( const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); PortableServer::Servant reference_to_servant_i ( CORBA::Object_ptr reference - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); + ); CORBA::Object_ptr servant_to_reference_i (PortableServer::Servant p_servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + ); /// Call the IORInterceptor::establish_components() method on all /// registered IORInterceptors. @@ -811,16 +693,14 @@ protected: protected: /// Accessor methods to ObjectReferenceTemplate PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_adapter_template (void); /// Accessor methods to ObjectReferenceTemplate, non locked version PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void); /// Accessor methods to PortableInterceptor::ObjectReferenceFactory PortableInterceptor::ObjectReferenceFactory * - get_obj_ref_factory (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_obj_ref_factory (void); /// Set the object reference factory void set_obj_ref_factory ( @@ -846,14 +726,12 @@ public: CORBA::Object_ptr invoke_key_to_object_helper_i (const char * repository_id, const PortableServer::ObjectId & id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); protected: /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one and hold the POA lock - TAO::ORT_Adapter *ORT_adapter (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO::ORT_Adapter *ORT_adapter (void); /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one but assumes the POA lock is already hold diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index 57851ab838f..d9da3792237 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -2,9 +2,6 @@ // // $Id$ -// Exception macros -#include "tao/Environment.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean @@ -27,21 +24,18 @@ TAO_Root_POA::policies (void) ACE_INLINE PortableServer::POA_ptr TAO_Root_POA::the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_nil (); } ACE_INLINE PortableInterceptor::AdapterName * TAO_Root_POA::adapter_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->adapter_name_i (); } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * TAO_Root_POA::get_adapter_template (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::ORT_Adapter *adapter = this->ORT_adapter (); @@ -66,7 +60,6 @@ TAO_Root_POA::get_adapter_template_i () ACE_INLINE PortableInterceptor::ObjectReferenceFactory * TAO_Root_POA::get_obj_ref_factory (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::ORT_Adapter *adapter = this->ORT_adapter (); @@ -98,7 +91,6 @@ TAO_Root_POA::name (void) const ACE_INLINE char * TAO_Root_POA::the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.c_str ()); } diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index b2598398103..5daea4a5819 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -24,7 +24,6 @@ namespace TAO CORBA::Policy_ptr ServantRetentionPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ServantRetentionPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -36,20 +35,17 @@ namespace TAO void ServantRetentionPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::ServantRetentionPolicyValue ServantRetentionPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::PolicyType ServantRetentionPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::SERVANT_RETENTION_POLICY_ID; } diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index 354ade7d9fc..ac39b59738b 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::ServantRetentionPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::ServantRetentionPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 41ffc3ef013..f1b1de2de9b 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -65,9 +65,7 @@ namespace TAO CORBA::Short priority, bool &wait_occurred_restart_call ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; #if !defined (CORBA_E_MICRO) virtual void activate_object_with_id ( @@ -76,10 +74,7 @@ namespace TAO CORBA::Short priority, bool &wait_occurred_restart_call ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; #endif virtual void deactivate_object (const PortableServer::ObjectId &id @@ -92,56 +87,44 @@ namespace TAO virtual PortableServer::ObjectId *system_id_to_object_id ( const PortableServer::ObjectId &system_id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual PortableServer::Servant user_id_to_servant ( const PortableServer::ObjectId &id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId &id, bool indirect ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual void deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr create_reference ( const char *intf, CORBA::Short priority ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 5a1b3acf7a7..da629fa29e0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -63,9 +63,6 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyNonRetain::system_id_to_object_id ( const PortableServer::ObjectId &system_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { // The system id is the id (and no conversion/transformation is // needed). @@ -80,9 +77,6 @@ namespace TAO PortableServer::Servant ServantRetentionStrategyNonRetain::user_id_to_servant ( const PortableServer::ObjectId &/*id*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -91,9 +85,6 @@ namespace TAO ServantRetentionStrategyNonRetain::id_to_reference ( const PortableServer::ObjectId &/*id*/, bool /*indirect*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -147,17 +138,12 @@ namespace TAO void ServantRetentionStrategyNonRetain::deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { } PortableServer::ObjectId * ServantRetentionStrategyNonRetain::servant_to_user_id ( PortableServer::Servant /*servant*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -165,9 +151,6 @@ namespace TAO CORBA::Object_ptr ServantRetentionStrategyNonRetain::servant_to_reference ( PortableServer::Servant /*servant*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -177,9 +160,6 @@ namespace TAO PortableServer::Servant /*servant*/, CORBA::Short /*priority*/, bool &/*wait_occurred_restart_call*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -191,10 +171,6 @@ namespace TAO PortableServer::Servant /*servant*/, CORBA::Short /*priority*/, bool &/*wait_occurred_restart_call*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { throw PortableServer::POA::WrongPolicy (); } @@ -204,8 +180,6 @@ namespace TAO ServantRetentionStrategyNonRetain::create_reference ( const char *intf, CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // This operation creates an object reference that encapsulates a // POA-generated Object Id value and the specified interface @@ -247,7 +221,6 @@ namespace TAO const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { // This operation creates an object reference that encapsulates the // specified Object Id and interface repository Id values. This diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 6950af6e4c0..8bac1e0af4d 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -46,10 +46,7 @@ namespace TAO PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + bool &wait_occurred_restart_call); #if !defined (CORBA_E_MICRO) virtual @@ -57,11 +54,7 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + bool &wait_occurred_restart_call); #endif virtual void deactivate_object (const PortableServer::ObjectId &id); @@ -74,24 +67,15 @@ namespace TAO virtual PortableServer::ObjectId *system_id_to_object_id ( const PortableServer::ObjectId &system_id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); + ); virtual PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + user_id_to_servant (const PortableServer::ObjectId &id); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + bool indirect); virtual TAO_SERVANT_LOCATION servant_present ( const PortableServer::ObjectId &system_id, @@ -106,33 +90,22 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + virtual void deactivate_all_objects (void); virtual PortableServer::ObjectId *servant_to_user_id ( - PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant servant); virtual CORBA::Object_ptr servant_to_reference ( - PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant servant); virtual CORBA::Object_ptr create_reference ( const char *intf, - CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + CORBA::Short priority); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short priority); virtual int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index ad91b278b33..3177736104e 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -174,9 +174,6 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyRetain::system_id_to_object_id ( const PortableServer::ObjectId &system_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { // The object denoted by the reference does not have to be // active for this operation to succeed. @@ -194,9 +191,6 @@ namespace TAO PortableServer::Servant ServantRetentionStrategyRetain::user_id_to_servant ( const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { // If the POA has the RETAIN policy and the specified ObjectId is in // the Active Object Map, this operation returns the servant @@ -218,9 +212,6 @@ namespace TAO ServantRetentionStrategyRetain::id_to_reference ( const PortableServer::ObjectId &id, bool indirect) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { // If an object with the specified Object Id value is currently // active, a reference encapsulating the information used to @@ -463,8 +454,6 @@ namespace TAO void ServantRetentionStrategyRetain::deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // If the etherealize_objects parameter is TRUE, the POA has the // RETAIN policy, and a servant manager is registered with the POA, @@ -510,9 +499,6 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyRetain::servant_to_user_id ( PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN and either the UNIQUE_ID or // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy @@ -597,9 +583,6 @@ namespace TAO ServantRetentionStrategyRetain::servant_to_system_id_i ( PortableServer::Servant servant, CORBA::Short &priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { #if defined (CORBA_E_COMPACT) || defined (CORBA_E_MICRO) if (this->poa_->allow_multiple_activations () || @@ -680,9 +663,6 @@ namespace TAO CORBA::Object_ptr ServantRetentionStrategyRetain::servant_to_reference ( PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { // Note: The allocation of an Object Id value and installation in // the Active Object Map caused by implicit activation may actually @@ -728,9 +708,6 @@ namespace TAO PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { if (!this->poa_->has_system_id ()) { @@ -792,10 +769,6 @@ namespace TAO PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { // If the POA has the SYSTEM_ID policy and it detects that the // Object Id value was not generated by the system or for this POA, @@ -898,8 +871,6 @@ namespace TAO ServantRetentionStrategyRetain::create_reference ( const char *intf, CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // This operation creates an object reference that encapsulates a // POA-generated Object Id value and the specified interface @@ -946,7 +917,6 @@ namespace TAO const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { // This operation creates an object reference that encapsulates the // specified Object Id and interface repository Id values. This diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 4ea03f1fa3f..ca8dd792244 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -48,10 +48,7 @@ namespace TAO activate_object (PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + ); #if !defined (CORBA_E_MICRO) virtual @@ -59,11 +56,7 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + bool &wait_occurred_restart_call); #endif void deactivate_object (const PortableServer::ObjectId &id); @@ -73,23 +66,14 @@ namespace TAO ); virtual PortableServer::ObjectId * system_id_to_object_id ( - const PortableServer::ObjectId &system_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); + const PortableServer::ObjectId &system_id); virtual PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + user_id_to_servant (const PortableServer::ObjectId &id); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + bool indirect); virtual TAO_SERVANT_LOCATION @@ -106,40 +90,29 @@ namespace TAO CORBA::Short &priority ); - virtual void deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + virtual void deactivate_all_objects (void); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::Object_ptr create_reference ( const char *intf, CORBA::Short priority - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::PortableServer::ServantRetentionPolicyValue type() const; @@ -158,10 +131,7 @@ namespace TAO PortableServer::Servant p_servant, CORBA::Short &priority - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual int rebind_using_user_id_and_system_id ( diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 8a954fda1fa..2ca679a8ff7 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -9,7 +9,6 @@ #include "tao/ORB_Core.h" #include "tao/TSS_Resources.h" #include "tao/Stub.h" -#include "tao/Environment.h" #include "tao/TAO_Server_Request.h" #include "tao/IFR_Client_Adapter.h" diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp index 5c5b012e62a..ee9a2675b01 100644 --- a/TAO/tao/PortableServer/Servant_var.cpp +++ b/TAO/tao/PortableServer/Servant_var.cpp @@ -10,8 +10,6 @@ #endif /* __ACE_INLINE__ */ #include "tao/Exception.h" -#include "tao/Environment.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index 40d3c9cfcc8..57b630bc0f3 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -22,7 +22,6 @@ namespace TAO CORBA::Policy_ptr ThreadPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ThreadPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -34,20 +33,17 @@ namespace TAO void ThreadPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::PortableServer::ThreadPolicyValue ThreadPolicy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return value_; } CORBA::PolicyType ThreadPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::PortableServer::THREAD_POLICY_ID; } diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index cd160aa8452..78cb33815ec 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -45,17 +45,13 @@ namespace TAO public: ThreadPolicy (::PortableServer::ThreadPolicyValue value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - ::PortableServer::ThreadPolicyValue value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::PortableServer::ThreadPolicyValue value (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); /// Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type (void) const; diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 0b2b530f7ec..8ba85735a94 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -22,7 +22,6 @@ #endif /* !ACE_LACKS_PRAGMA_ONCE */ #include "tao/Versioned_Namespace.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index 8cf5df3fb47..8d865765f1d 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -3,6 +3,7 @@ #include "tao/PortableServer/Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/DII_Arguments_Converter.h" +#include "tao/SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 # include "tao/ServerRequestInterceptor_Adapter.h" diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index 585fad89eb4..59dbe9b47ab 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -25,8 +25,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -#include "ace/CORBA_macros.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index 86da46eaefb..a3504f16672 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -8,7 +8,6 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 0085b33d407..89c5adc12e3 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -17,6 +17,7 @@ #include "tao/Client_Strategy_Factory.h" #include "ace/Countdown_Time.h" +#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/Profile_Transport_Resolver.inl" @@ -78,7 +79,6 @@ namespace TAO void Profile_Transport_Resolver::resolve (ACE_Time_Value *max_time_val ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Countdown_Time countdown (max_time_val); @@ -245,7 +245,6 @@ namespace TAO void Profile_Transport_Resolver::init_inconsistent_policies ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->inconsistent_policies_, CORBA::PolicyList (0), diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 031e75e3885..01bffa9f315 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -21,9 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" - -#include "tao/SystemException.h" #include "tao/Transport_Selection_Guard.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -89,8 +86,7 @@ namespace TAO * the profile. */ void resolve (ACE_Time_Value *val - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); //@{ /** @@ -153,8 +149,7 @@ namespace TAO /// Initialize the inconsistent policy list that this object has /// cached. - void init_inconsistent_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void init_inconsistent_policies (void); CORBA::PolicyList *inconsistent_policies (void) const; diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 7a3f336dd87..e48a877fb3d 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -49,7 +49,6 @@ #include "tao/ORB.h" #include "tao/TimeBaseC.h" #include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/Object.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" @@ -305,9 +304,7 @@ namespace RTCORBA virtual ::RTCORBA::PriorityModel priority_model ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -315,9 +312,7 @@ namespace RTCORBA virtual RTCORBA::Priority server_priority ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -325,9 +320,7 @@ namespace RTCORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -335,9 +328,7 @@ namespace RTCORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -439,9 +430,7 @@ namespace RTCORBA virtual RTCORBA::ThreadpoolId threadpool ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -449,9 +438,7 @@ namespace RTCORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -459,9 +446,7 @@ namespace RTCORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -740,9 +725,7 @@ namespace RTCORBA virtual ::RTCORBA::ProtocolList * protocols ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -750,9 +733,7 @@ namespace RTCORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -760,9 +741,7 @@ namespace RTCORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -864,9 +843,7 @@ namespace RTCORBA virtual ::RTCORBA::ProtocolList * protocols ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -874,9 +851,7 @@ namespace RTCORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -884,9 +859,7 @@ namespace RTCORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -988,9 +961,7 @@ namespace RTCORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -998,9 +969,7 @@ namespace RTCORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -1097,9 +1066,7 @@ namespace RTCORBA virtual CORBA::Long send_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1108,9 +1075,7 @@ namespace RTCORBA ::CORBA::Long send_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1118,9 +1083,7 @@ namespace RTCORBA virtual CORBA::Long recv_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1129,9 +1092,7 @@ namespace RTCORBA ::CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1139,9 +1100,7 @@ namespace RTCORBA virtual CORBA::Boolean keep_alive ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1150,9 +1109,7 @@ namespace RTCORBA ::CORBA::Boolean keep_alive ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1160,9 +1117,7 @@ namespace RTCORBA virtual CORBA::Boolean dont_route ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1171,9 +1126,7 @@ namespace RTCORBA ::CORBA::Boolean dont_route ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1181,9 +1134,7 @@ namespace RTCORBA virtual CORBA::Boolean no_delay ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1192,9 +1143,7 @@ namespace RTCORBA ::CORBA::Boolean no_delay ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1202,9 +1151,7 @@ namespace RTCORBA virtual CORBA::Boolean enable_network_priority ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1213,9 +1160,7 @@ namespace RTCORBA ::CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -1401,9 +1346,7 @@ namespace RTCORBA virtual CORBA::Long send_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1412,9 +1355,7 @@ namespace RTCORBA ::CORBA::Long send_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1422,9 +1363,7 @@ namespace RTCORBA virtual CORBA::Long recv_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1433,9 +1372,7 @@ namespace RTCORBA ::CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -1532,9 +1469,7 @@ namespace RTCORBA virtual CORBA::Long send_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1543,9 +1478,7 @@ namespace RTCORBA ::CORBA::Long send_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1553,9 +1486,7 @@ namespace RTCORBA virtual CORBA::Long recv_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1564,9 +1495,7 @@ namespace RTCORBA ::CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1574,9 +1503,7 @@ namespace RTCORBA virtual CORBA::Boolean keep_alive ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1585,9 +1512,7 @@ namespace RTCORBA ::CORBA::Boolean keep_alive ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1595,9 +1520,7 @@ namespace RTCORBA virtual CORBA::Boolean dont_route ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1606,9 +1529,7 @@ namespace RTCORBA ::CORBA::Boolean dont_route ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1616,9 +1537,7 @@ namespace RTCORBA virtual CORBA::Boolean no_delay ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1627,9 +1546,7 @@ namespace RTCORBA ::CORBA::Boolean no_delay ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1637,9 +1554,7 @@ namespace RTCORBA virtual CORBA::Long preallocate_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1648,9 +1563,7 @@ namespace RTCORBA ::CORBA::Long preallocate_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1658,9 +1571,7 @@ namespace RTCORBA virtual char * mmap_filename ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1669,9 +1580,7 @@ namespace RTCORBA const char * mmap_filename ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1679,9 +1588,7 @@ namespace RTCORBA virtual char * mmap_lockname ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1690,9 +1597,7 @@ namespace RTCORBA const char * mmap_lockname ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -1789,9 +1694,7 @@ namespace RTCORBA virtual CORBA::Boolean enable_network_priority ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1800,9 +1703,7 @@ namespace RTCORBA ::CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -1899,9 +1800,7 @@ namespace RTCORBA virtual CORBA::Long send_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1910,9 +1809,7 @@ namespace RTCORBA ::CORBA::Long send_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1920,9 +1817,7 @@ namespace RTCORBA virtual CORBA::Long recv_buffer_size ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1931,9 +1826,7 @@ namespace RTCORBA ::CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1941,9 +1834,7 @@ namespace RTCORBA virtual CORBA::Boolean keep_alive ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1952,9 +1843,7 @@ namespace RTCORBA ::CORBA::Boolean keep_alive ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1962,9 +1851,7 @@ namespace RTCORBA virtual CORBA::Boolean dont_route ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1973,9 +1860,7 @@ namespace RTCORBA ::CORBA::Boolean dont_route ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1983,9 +1868,7 @@ namespace RTCORBA virtual CORBA::Boolean no_delay ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -1994,9 +1877,7 @@ namespace RTCORBA ::CORBA::Boolean no_delay ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2004,9 +1885,7 @@ namespace RTCORBA virtual CORBA::Boolean enable_network_priority ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2015,9 +1894,7 @@ namespace RTCORBA ::CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -2201,9 +2078,7 @@ namespace RTCORBA virtual ::RTCORBA::PriorityBands * priority_bands ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2211,9 +2086,7 @@ namespace RTCORBA virtual ::CORBA::Policy_ptr copy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2221,9 +2094,7 @@ namespace RTCORBA virtual void destroy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -2320,9 +2191,7 @@ namespace RTCORBA virtual RTCORBA::Priority the_priority ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2331,9 +2200,7 @@ namespace RTCORBA ::RTCORBA::Priority the_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -2430,9 +2297,7 @@ namespace RTCORBA virtual void lock ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2440,9 +2305,7 @@ namespace RTCORBA virtual void unlock ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2451,9 +2314,7 @@ namespace RTCORBA ::TimeBase::TimeT max_wait ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 @@ -2550,9 +2411,7 @@ namespace RTCORBA virtual ::RTCORBA::Mutex_ptr create_mutex ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2561,9 +2420,7 @@ namespace RTCORBA ::RTCORBA::Mutex_ptr the_mutex ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 @@ -2623,9 +2480,7 @@ namespace RTCORBA ::CORBA::Boolean_out created_flag ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2634,10 +2489,7 @@ namespace RTCORBA const char * name ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::RTCORBA::RTORB::MutexNotFound - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2651,9 +2503,7 @@ namespace RTCORBA ::CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2663,9 +2513,7 @@ namespace RTCORBA ::CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2681,9 +2529,7 @@ namespace RTCORBA const char * mmap_lockname ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2692,9 +2538,7 @@ namespace RTCORBA ::CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2708,9 +2552,7 @@ namespace RTCORBA ::CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 @@ -2775,9 +2617,7 @@ namespace RTCORBA ::CORBA::ULong max_request_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2791,9 +2631,7 @@ namespace RTCORBA ::CORBA::ULong max_request_buffer_size ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2802,10 +2640,7 @@ namespace RTCORBA ::RTCORBA::ThreadpoolId threadpool ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::RTCORBA::RTORB::InvalidThreadpool - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2815,9 +2650,7 @@ namespace RTCORBA ::RTCORBA::Priority server_priority ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2826,9 +2659,7 @@ namespace RTCORBA ::RTCORBA::ThreadpoolId threadpool ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2837,9 +2668,7 @@ namespace RTCORBA const ::RTCORBA::PriorityBands & priority_bands ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2848,9 +2677,7 @@ namespace RTCORBA const ::RTCORBA::ProtocolList & protocols ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2859,9 +2686,7 @@ namespace RTCORBA const ::RTCORBA::ProtocolList & protocols ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -2869,9 +2694,7 @@ namespace RTCORBA virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( void ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index 196877f5424..322e8634590 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -11,6 +11,7 @@ #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Protocols_Hooks.h" +#include "tao/SystemException.h" #include "ace/Thread.h" @@ -31,15 +32,12 @@ TAO_RT_Current::~TAO_RT_Current (void) RTCORBA::Priority TAO_RT_Current::the_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (); RTCORBA::Priority priority; - int const result = tph->get_thread_CORBA_priority (priority); - - if (result == -1) + if (tph->get_thread_CORBA_priority (priority) == -1) throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO); return priority; @@ -47,14 +45,11 @@ TAO_RT_Current::the_priority (void) void TAO_RT_Current::the_priority (RTCORBA::Priority the_priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (); - int const result = tph->set_thread_CORBA_priority (the_priority); - - if (result == -1) + if (tph->set_thread_CORBA_priority (the_priority) == -1) throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO); } diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index c80d668dd8e..7acf3f227cf 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -52,11 +52,9 @@ public: /// Default constructor. TAO_RT_Current (TAO_ORB_Core *orb_core); - virtual RTCORBA::Priority the_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RTCORBA::Priority the_priority (void); - virtual void the_priority (RTCORBA::Priority the_priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void the_priority (RTCORBA::Priority the_priority); protected: diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index bc92b6104dc..1cb9458734c 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -8,6 +8,8 @@ #include "tao/RTCORBA/RT_Stub.h" +#include "tao/SystemException.h" + ACE_RCSID (RTCORBA, RT_Endpoint_Utils, "$Id$") @@ -27,8 +29,7 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, try { policy = - rt_stub->get_cached_policy (type - ); + rt_stub->get_cached_policy (type); } catch (const ::CORBA::INV_POLICY&) { @@ -36,8 +37,7 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, { CORBA::PolicyList *p = r.inconsistent_policies (); p->length (1); - (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type - ); + (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type); } throw; diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index e4451641335..1063ce32d97 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -17,6 +17,7 @@ #include "tao/Endpoint.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/ORB_Core.h" +#include "tao/SystemException.h" ACE_RCSID (RTCORBA, RT_Invocation_Endpoint_Selectors, diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index dc830412021..d0c7b4c22ff 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -4,6 +4,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/RTCORBA/RT_ORB.h" +#include "tao/SystemException.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID(RTCORBA, @@ -18,7 +19,6 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void) void TAO_RT_Mutex::lock (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->mu_.acquire () != 0) throw ::CORBA::INTERNAL (); @@ -26,16 +26,13 @@ TAO_RT_Mutex::lock (void) void TAO_RT_Mutex::unlock (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->mu_.release () != 0) throw ::CORBA::INTERNAL (); } CORBA::Boolean -TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time - ) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time) { int result; diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 89732b0008b..0b3d00bd600 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -58,12 +58,10 @@ class TAO_RTCORBA_Export TAO_RT_Mutex public: /// Acquire the lock. - virtual void lock (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void lock (void); /// Release the lock. - virtual void unlock (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void unlock (void); /** * Acquire the lock, but only wait up to @a max_wait time. Note @@ -72,8 +70,7 @@ public: * using this operation in your program designs. */ virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Returns the name of the mutex. virtual const char *name (void) const; diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 8aacb308375..51c6cf40e1d 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -9,6 +9,7 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" +#include "tao/SystemException.h" #include "tao/RTCORBA/Thread_Pool.h" #include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h" #include "ace/Sched_Params.h" @@ -42,14 +43,12 @@ TAO_RT_ORB::~TAO_RT_ORB (void) RTCORBA::Mutex_ptr TAO_RT_ORB::create_mutex (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mutex_mgr_.create_mutex (); } void TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->mutex_mgr_.destroy_mutex (mutex); } @@ -58,14 +57,12 @@ TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex) RTCORBA::Mutex_ptr TAO_RT_ORB::create_named_mutex (const char *name, CORBA::Boolean_out created_flag) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mutex_mgr_.create_named_mutex (name, created_flag); } RTCORBA::Mutex_ptr TAO_RT_ORB::open_named_mutex (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { return this->mutex_mgr_.open_named_mutex (name); } @@ -82,7 +79,6 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void) RTCORBA::Mutex_ptr TAO_Named_RT_Mutex_Manager::create_mutex (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *mutex = 0; ACE_NEW_THROW_EX (mutex, @@ -101,7 +97,6 @@ TAO_Named_RT_Mutex_Manager::create_mutex (void) #if (TAO_HAS_NAMED_RT_MUTEXES == 1) void TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *tao_mutex = dynamic_cast<TAO_RT_Mutex *> (mutex); @@ -127,7 +122,6 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex) #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ void TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ @@ -135,7 +129,6 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr) RTCORBA::Mutex_ptr TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, CORBA::Boolean_out created_flag) - ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_NAMED_RT_MUTEXES == 1) // The following should be atomic. @@ -185,8 +178,6 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, RTCORBA::Mutex_ptr TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - RTCORBA::RTORB::MutexNotFound)) { #if (TAO_HAS_NAMED_RT_MUTEXES == 1) // The following should be atomic. @@ -218,7 +209,6 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size, CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC ((CORBA::SystemException )) { TAO_TCP_Protocol_Properties *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -239,7 +229,6 @@ TAO_RT_ORB::create_unix_domain_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UnixDomain_Protocol_Properties *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -262,7 +251,6 @@ TAO_RT_ORB::create_shared_memory_protocol_properties ( CORBA::Long preallocate_buffer_size, const char *mmap_filename, const char *mmap_lockname) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SharedMemory_Protocol_Properties *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -284,7 +272,6 @@ RTCORBA::UserDatagramProtocolProperties_ptr TAO_RT_ORB::create_user_datagram_protocol_properties ( CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UserDatagram_Protocol_Properties *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -305,7 +292,6 @@ TAO_RT_ORB::create_stream_control_protocol_properties ( CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_StreamControl_Protocol_Properties *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -331,7 +317,6 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool (stacksize, static_threads, @@ -352,7 +337,6 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool_with_lanes (stacksize, lanes, @@ -366,8 +350,6 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, void TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool) - ACE_THROW_SPEC ((CORBA::SystemException, - RTCORBA::RTORB::InvalidThreadpool)) { this->tp_manager_->destroy_threadpool (threadpool); } @@ -376,7 +358,6 @@ RTCORBA::PriorityModelPolicy_ptr TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -389,7 +370,6 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, RTCORBA::ThreadpoolPolicy_ptr TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -404,7 +384,6 @@ RTCORBA::PriorityBandedConnectionPolicy_ptr TAO_RT_ORB::create_priority_banded_connection_policy (const RTCORBA::PriorityBands & priority_bands ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -417,7 +396,6 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const RTCORBA::PrivateConnectionPolicy_ptr TAO_RT_ORB::create_private_connection_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -431,7 +409,6 @@ TAO_RT_ORB::create_private_connection_policy (void) RTCORBA::ServerProtocolPolicy_ptr TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -445,7 +422,6 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco RTCORBA::ClientProtocolPolicy_ptr TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 9c5852963c2..f485e2fb64a 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -60,18 +60,14 @@ public: /// Destructor. ~TAO_Named_RT_Mutex_Manager (void); - RTCORBA::Mutex_ptr create_mutex (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::Mutex_ptr create_mutex (void); - void destroy_mutex (RTCORBA::Mutex_ptr the_mutex) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy_mutex (RTCORBA::Mutex_ptr the_mutex); RTCORBA::Mutex_ptr create_named_mutex (const char *name, - CORBA::Boolean_out created_flag) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean_out created_flag); - RTCORBA::Mutex_ptr open_named_mutex (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)); + RTCORBA::Mutex_ptr open_named_mutex (const char * name); private: @@ -112,16 +108,14 @@ public: * consistant priority inheritance/piority ceiling semantics * can be guaranteed. */ - virtual RTCORBA::Mutex_ptr create_mutex (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RTCORBA::Mutex_ptr create_mutex (void); /** * Destroy a mutex. Currently this is a no-op since RTCORBA::Mutex * instances are destroyed as soon as their reference counts go to * 0. */ - virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex); /** * Create a mutex and assign a name to it. If the @@ -129,12 +123,10 @@ public: * is set to 0. */ virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name, - CORBA::Boolean_out created_flag) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean_out created_flag); /// Retrieve a previously created mutex. - virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)); + virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name); /** * Create and return a TCPProtocolProperties instance with the specified @@ -147,14 +139,12 @@ public: CORBA::Boolean keep_alive, CORBA::Boolean dont_route, CORBA::Boolean no_delay, - CORBA::Boolean enable_network_priority) - ACE_THROW_SPEC ((CORBA::SystemException )); + CORBA::Boolean enable_network_priority); RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties ( CORBA::Long send_buffer_size, - CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long recv_buffer_size ); RTCORBA::SharedMemoryProtocolProperties_ptr create_shared_memory_protocol_properties ( @@ -166,14 +156,12 @@ public: CORBA::Long preallocate_buffer_size, const char *mmap_filename, const char *mmap_lockname - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties ( CORBA::Boolean enable_network_priority - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); RTCORBA::StreamControlProtocolProperties_ptr create_stream_control_protocol_properties ( @@ -183,8 +171,7 @@ public: CORBA::Boolean dont_route, CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Create a RTCORBA threadpool to manage a set of threads without lanes. virtual RTCORBA::ThreadpoolId @@ -195,8 +182,7 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /** * Create a threadpool and separate it into subsets based on @@ -209,27 +195,22 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Free the resources associated with the specified threadpool. virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ) - ACE_THROW_SPEC ((CORBA::SystemException, - RTCORBA::RTORB::InvalidThreadpool)); + ); /// Create a priority model policy for use when configuring a POA. virtual RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Create a ThreadpoolPolicy instance for POA creation virtual RTCORBA::ThreadpoolPolicy_ptr - create_threadpool_policy (RTCORBA::ThreadpoolId threadpool) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_threadpool_policy (RTCORBA::ThreadpoolId threadpool); /** * Create a PriorityBandedConnectionPolicy instance @@ -237,8 +218,7 @@ public: */ virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (const RTCORBA::PriorityBands & - priority_bands) - ACE_THROW_SPEC ((CORBA::SystemException)); + priority_bands); /** * Create a PrivateConnectionPolicy instance to use on client @@ -246,24 +226,21 @@ public: * to the server. */ virtual RTCORBA::PrivateConnectionPolicy_ptr - create_private_connection_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_private_connection_policy (void); /** * Create a ServerProtocolPolicy instance to select and configure * communication protocols on the server side. */ virtual RTCORBA::ServerProtocolPolicy_ptr - create_server_protocol_policy (const RTCORBA::ProtocolList & protocols) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_server_protocol_policy (const RTCORBA::ProtocolList & protocols); /** * Create a ClientProtocolPolicy instance to select and configure * communication protocols on the client side. */ virtual RTCORBA::ClientProtocolPolicy_ptr - create_client_protocol_policy (const RTCORBA::ProtocolList & protocols) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_client_protocol_policy (const RTCORBA::ProtocolList & protocols); /// Reference to our creating ORB Core. TAO_ORB_Core *orb_core (void) const; diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 1651d70f8a9..9eef8d09122 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -63,7 +63,6 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type, void TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // // Register all of the RT related services. @@ -206,7 +205,6 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) void TAO_RT_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); } diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index 9a4cbe33ad2..adc676ef0de 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -65,11 +65,9 @@ public: long scope_policy, ACE_Time_Value const &dynamic_thread_idle_timeout); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp index a4ec2936b7c..91fc5db1537 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp @@ -17,8 +17,6 @@ CORBA::Policy_ptr TAO_RT_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) return TAO_PriorityModelPolicy::create (value); @@ -42,11 +40,7 @@ TAO_RT_PolicyFactory::create_policy ( } CORBA::Policy_ptr -TAO_RT_PolicyFactory::_create_policy ( - CORBA::PolicyType type - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) +TAO_RT_PolicyFactory::_create_policy (CORBA::PolicyType type) { CORBA::Policy_ptr policy = CORBA::Policy::_nil (); diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index d51b6ec34c8..99ca81ff1a6 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -48,14 +48,10 @@ public: CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + ); CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 2e7e82f7227..52fb0b3875b 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -9,6 +9,7 @@ #include "tao/debug.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -73,28 +74,24 @@ TAO_PriorityModelPolicy::get_priority_model (void) RTCORBA::PriorityModel TAO_PriorityModelPolicy::priority_model (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->priority_model_; } RTCORBA::Priority TAO_PriorityModelPolicy::server_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_priority_; } CORBA::PolicyType TAO_PriorityModelPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIORITY_MODEL_POLICY_TYPE; } CORBA::Policy_ptr TAO_PriorityModelPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -107,7 +104,6 @@ TAO_PriorityModelPolicy::copy (void) void TAO_PriorityModelPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -190,21 +186,18 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val RTCORBA::ThreadpoolId TAO_ThreadpoolPolicy::threadpool (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->id_; } CORBA::PolicyType TAO_ThreadpoolPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::THREADPOOL_POLICY_TYPE; } CORBA::Policy_ptr TAO_ThreadpoolPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -217,7 +210,6 @@ TAO_ThreadpoolPolicy::copy (void) void TAO_ThreadpoolPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -259,8 +251,7 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void) } CORBA::Policy_ptr -TAO_PrivateConnectionPolicy::create (const CORBA::Any & - ) +TAO_PrivateConnectionPolicy::create (const CORBA::Any &) { TAO_PrivateConnectionPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -273,14 +264,12 @@ TAO_PrivateConnectionPolicy::create (const CORBA::Any & CORBA::PolicyType TAO_PrivateConnectionPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE; } CORBA::Policy_ptr TAO_PrivateConnectionPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -293,7 +282,6 @@ TAO_PrivateConnectionPolicy::copy (void) void TAO_PrivateConnectionPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -360,7 +348,6 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val RTCORBA::PriorityBands * TAO_PriorityBandedConnectionPolicy::priority_bands (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::PriorityBands *tmp; ACE_NEW_THROW_EX (tmp, @@ -373,14 +360,12 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (void) CORBA::PolicyType TAO_PriorityBandedConnectionPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE; } CORBA::Policy_ptr TAO_PriorityBandedConnectionPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -393,7 +378,6 @@ TAO_PriorityBandedConnectionPolicy::copy (void) void TAO_PriorityBandedConnectionPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -473,7 +457,6 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val RTCORBA::ProtocolList * TAO_ServerProtocolPolicy::protocols (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::ProtocolList *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -486,14 +469,12 @@ TAO_ServerProtocolPolicy::protocols (void) CORBA::PolicyType TAO_ServerProtocolPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE; } CORBA::Policy_ptr TAO_ServerProtocolPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -506,7 +487,6 @@ TAO_ServerProtocolPolicy::copy (void) void TAO_ServerProtocolPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -579,7 +559,6 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val RTCORBA::ProtocolList * TAO_ClientProtocolPolicy::protocols (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::ProtocolList *tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -592,14 +571,12 @@ TAO_ClientProtocolPolicy::protocols (void) CORBA::PolicyType TAO_ClientProtocolPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE; } CORBA::Policy_ptr TAO_ClientProtocolPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -612,7 +589,6 @@ TAO_ClientProtocolPolicy::copy (void) void TAO_ClientProtocolPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -713,7 +689,6 @@ TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void) CORBA::Long TAO_TCP_Protocol_Properties::send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; } @@ -721,14 +696,12 @@ TAO_TCP_Protocol_Properties::send_buffer_size (void) void TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long TAO_TCP_Protocol_Properties::recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; } @@ -736,14 +709,12 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (void) void TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean TAO_TCP_Protocol_Properties::keep_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; } @@ -751,14 +722,12 @@ TAO_TCP_Protocol_Properties::keep_alive (void) void TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean TAO_TCP_Protocol_Properties::dont_route (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; } @@ -766,13 +735,11 @@ TAO_TCP_Protocol_Properties::dont_route (void) void TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; } @@ -780,14 +747,12 @@ CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void) void TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; } CORBA::Boolean TAO_TCP_Protocol_Properties::enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->enable_network_priority_; } @@ -795,7 +760,6 @@ TAO_TCP_Protocol_Properties::enable_network_priority (void) void TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->enable_network_priority_ = enable; } @@ -844,7 +808,6 @@ TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void) CORBA::Long TAO_UnixDomain_Protocol_Properties::send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; } @@ -852,14 +815,12 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (void) void TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; } @@ -867,7 +828,6 @@ TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void) void TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } @@ -914,7 +874,6 @@ TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (voi CORBA::Long TAO_SharedMemory_Protocol_Properties::send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; } @@ -922,14 +881,12 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (void) void TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; } @@ -937,14 +894,12 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void) void TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean TAO_SharedMemory_Protocol_Properties::keep_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; } @@ -952,14 +907,12 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (void) void TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean TAO_SharedMemory_Protocol_Properties::dont_route (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; } @@ -967,14 +920,12 @@ TAO_SharedMemory_Protocol_Properties::dont_route (void) void TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } CORBA::Boolean TAO_SharedMemory_Protocol_Properties::no_delay (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; } @@ -982,14 +933,12 @@ TAO_SharedMemory_Protocol_Properties::no_delay (void) void TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; } CORBA::Long TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->preallocate_buffer_size_; } @@ -997,14 +946,12 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void) void TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->preallocate_buffer_size_ = preallocate_buffer_size; } char * TAO_SharedMemory_Protocol_Properties::mmap_filename (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mmap_filename_.rep (); } @@ -1012,14 +959,12 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (void) void TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->mmap_filename_.set (mmap_filename); } char * TAO_SharedMemory_Protocol_Properties::mmap_lockname (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mmap_lockname_.rep (); } @@ -1027,7 +972,6 @@ TAO_SharedMemory_Protocol_Properties::mmap_lockname (void) void TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->mmap_lockname_.set (mmap_lockname); } @@ -1085,7 +1029,6 @@ TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (voi CORBA::Boolean TAO_UserDatagram_Protocol_Properties::enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->enable_network_priority_; } @@ -1093,7 +1036,6 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (void) void TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->enable_network_priority_ = enable; } @@ -1133,7 +1075,6 @@ TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (v CORBA::Long TAO_StreamControl_Protocol_Properties::send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->send_buffer_size_; } @@ -1141,14 +1082,12 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (void) void TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->send_buffer_size_ = send_buffer_size; } CORBA::Long TAO_StreamControl_Protocol_Properties::recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recv_buffer_size_; } @@ -1156,14 +1095,12 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (void) void TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->recv_buffer_size_ = recv_buffer_size; } CORBA::Boolean TAO_StreamControl_Protocol_Properties::keep_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->keep_alive_; } @@ -1171,14 +1108,12 @@ TAO_StreamControl_Protocol_Properties::keep_alive (void) void TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->keep_alive_ = keep_alive; } CORBA::Boolean TAO_StreamControl_Protocol_Properties::dont_route (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->dont_route_; } @@ -1186,13 +1121,11 @@ TAO_StreamControl_Protocol_Properties::dont_route (void) void TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->dont_route_ = dont_route; } CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->no_delay_; } @@ -1200,14 +1133,12 @@ CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void) void TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->no_delay_ = no_delay; } CORBA::Boolean TAO_StreamControl_Protocol_Properties::enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->enable_network_priority_; } @@ -1215,7 +1146,6 @@ TAO_StreamControl_Protocol_Properties::enable_network_priority (void) void TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->enable_network_priority_ = enable; } diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 401eafaf4df..6893cb5fe6a 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -68,20 +68,15 @@ public: */ RTCORBA::PriorityModel get_priority_model (void); - RTCORBA::PriorityModel priority_model (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::PriorityModel priority_model (void); - RTCORBA::Priority server_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::Priority server_priority (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); /// This method writes a CDR representation of the object state. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -137,17 +132,13 @@ public: /// Copy constructor. TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs); - RTCORBA::ThreadpoolId threadpool (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::ThreadpoolId threadpool (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type (void) const; @@ -193,14 +184,11 @@ public: /// Copy constructor. TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type (void) const; @@ -251,17 +239,13 @@ public: */ RTCORBA::PriorityBands &priority_bands_rep (void); - RTCORBA::PriorityBands *priority_bands (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::PriorityBands *priority_bands (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); /// This method writes a CDR representation of the current object. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -325,17 +309,13 @@ public: RTCORBA::ProtocolList & protocols_rep (void); RTCORBA::ProtocolList *protocols - (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type (void) const; @@ -388,17 +368,13 @@ public: RTCORBA::ProtocolList & protocols_rep (void); RTCORBA::ProtocolList *protocols - (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + (void); - CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::PolicyType policy_type (void); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // = CDR Encoder/Decoder. @@ -457,41 +433,29 @@ public: CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority); - CORBA::Long send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long send_buffer_size (void); - void send_buffer_size (CORBA::Long send_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_buffer_size (CORBA::Long send_buffer_size); - CORBA::Long recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long recv_buffer_size (void); - void recv_buffer_size (CORBA::Long recv_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void recv_buffer_size (CORBA::Long recv_buffer_size); - CORBA::Boolean keep_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean keep_alive (void); - void keep_alive (CORBA::Boolean keep_alive) - ACE_THROW_SPEC ((CORBA::SystemException)); + void keep_alive (CORBA::Boolean keep_alive); - CORBA::Boolean dont_route (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean dont_route (void); - void dont_route (CORBA::Boolean dont_route) - ACE_THROW_SPEC ((CORBA::SystemException)); + void dont_route (CORBA::Boolean dont_route); - CORBA::Boolean no_delay (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean no_delay (void); - void no_delay (CORBA::Boolean no_delay) - ACE_THROW_SPEC ((CORBA::SystemException)); + void no_delay (CORBA::Boolean no_delay); - CORBA::Boolean enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean enable_network_priority (void); - void enable_network_priority (CORBA::Boolean enable) - ACE_THROW_SPEC ((CORBA::SystemException)); + void enable_network_priority (CORBA::Boolean enable); /// This method writes a CDR representation of TCPProtocolProperties. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -536,17 +500,13 @@ public: TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size); - CORBA::Long send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long send_buffer_size (void); - void send_buffer_size (CORBA::Long send_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_buffer_size (CORBA::Long send_buffer_size); - CORBA::Long recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long recv_buffer_size (void); - void recv_buffer_size (CORBA::Long recv_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void recv_buffer_size (CORBA::Long recv_buffer_size); /** * This method writes the CDR encapsulation of an instance of @@ -607,57 +567,40 @@ public: // = IDL interface methods. - CORBA::Long send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long send_buffer_size (void); - void send_buffer_size (CORBA::Long send_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_buffer_size (CORBA::Long send_buffer_size); - CORBA::Long recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long recv_buffer_size (void); - void recv_buffer_size (CORBA::Long recv_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void recv_buffer_size (CORBA::Long recv_buffer_size); - CORBA::Boolean keep_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean keep_alive (void); - void keep_alive (CORBA::Boolean keep_alive) - ACE_THROW_SPEC ((CORBA::SystemException)); + void keep_alive (CORBA::Boolean keep_alive); - CORBA::Boolean dont_route (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean dont_route (void); - void dont_route (CORBA::Boolean dont_route) - ACE_THROW_SPEC ((CORBA::SystemException)); + void dont_route (CORBA::Boolean dont_route); - CORBA::Boolean no_delay (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean no_delay (void); void no_delay (CORBA::Boolean no_delay - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); - CORBA::Boolean enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean enable_network_priority (void); - CORBA::Long preallocate_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long preallocate_buffer_size (void); - void preallocate_buffer_size (CORBA::Long preallocate_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void preallocate_buffer_size (CORBA::Long preallocate_buffer_size); - char *mmap_filename (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char *mmap_filename (void); - void mmap_filename (const char *mmap_filename) - ACE_THROW_SPEC ((CORBA::SystemException)); + void mmap_filename (const char *mmap_filename); - char *mmap_lockname (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char *mmap_lockname (void); - void mmap_lockname (const char *mmap_lockname) - ACE_THROW_SPEC ((CORBA::SystemException)); + void mmap_lockname (const char *mmap_lockname); /** * This method writes the CDR encapsulation of an instance of @@ -713,11 +656,9 @@ public: /// Constructor. TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority); - CORBA::Boolean enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean enable_network_priority (void); - void enable_network_priority (CORBA::Boolean enable) - ACE_THROW_SPEC ((CORBA::SystemException)); + void enable_network_priority (CORBA::Boolean enable); /// This method writes a CDR representation of UserDatagramProtocolProperties. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -759,41 +700,29 @@ public: CORBA::Boolean no_delay, CORBA::Boolean enable_network_priority); - CORBA::Long send_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long send_buffer_size (void); - void send_buffer_size (CORBA::Long send_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_buffer_size (CORBA::Long send_buffer_size); - CORBA::Long recv_buffer_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long recv_buffer_size (void); - void recv_buffer_size (CORBA::Long recv_buffer_size) - ACE_THROW_SPEC ((CORBA::SystemException)); + void recv_buffer_size (CORBA::Long recv_buffer_size); - CORBA::Boolean keep_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean keep_alive (void); - void keep_alive (CORBA::Boolean keep_alive) - ACE_THROW_SPEC ((CORBA::SystemException)); + void keep_alive (CORBA::Boolean keep_alive); - CORBA::Boolean dont_route (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean dont_route (void); - void dont_route (CORBA::Boolean dont_route) - ACE_THROW_SPEC ((CORBA::SystemException)); + void dont_route (CORBA::Boolean dont_route); - CORBA::Boolean no_delay (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean no_delay (void); - void no_delay (CORBA::Boolean no_delay) - ACE_THROW_SPEC ((CORBA::SystemException)); + void no_delay (CORBA::Boolean no_delay); - CORBA::Boolean enable_network_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean enable_network_priority (void); - void enable_network_priority (CORBA::Boolean enable) - ACE_THROW_SPEC ((CORBA::SystemException)); + void enable_network_priority (CORBA::Boolean enable); /// This method writes a CDR representation of StreamControlProtocolProperties. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 139538e68d8..8cf78be0c6d 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -18,6 +18,7 @@ #include "tao/Policy_Set.h" #include "tao/debug.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" @@ -70,8 +71,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core) RTCORBA::ProtocolProperties_ptr TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag, - CORBA::Policy_ptr policy - ) + CORBA::Policy_ptr policy) { if (CORBA::is_nil (policy)) return 0; @@ -176,8 +176,7 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie ) { RTCORBA::TCPProtocolProperties_var protocol_properties = - RTCORBA::TCPProtocolProperties::_narrow (from - ); + RTCORBA::TCPProtocolProperties::_narrow (from); to.send_buffer_size_ = protocol_properties->send_buffer_size (); to.recv_buffer_size_ = protocol_properties->recv_buffer_size (); @@ -188,8 +187,7 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie } void -TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to - ) +TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to) { RTCORBA::ProtocolProperties_var from = this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP); diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index 84691dc0a24..ee410570711 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -8,7 +8,7 @@ #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "tao/Policy_Manager.h" - +#include "tao/SystemException.h" ACE_RCSID (RTCORBA, RT_Stub, diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index e7818d1917b..5a37a0282e9 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -715,7 +715,6 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_THREAD_POOL_MANAGER_GUARD; @@ -739,7 +738,6 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_THREAD_POOL_MANAGER_GUARD; @@ -749,15 +747,11 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, allow_request_buffering, max_buffered_requests, max_request_buffer_size, - dynamic_thread_idle_timeout - ); + dynamic_thread_idle_timeout); } void -TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ) - ACE_THROW_SPEC ((CORBA::SystemException, - RTCORBA::RTORB::InvalidThreadpool)) +TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool) { TAO_Thread_Pool *tao_thread_pool = 0; @@ -805,7 +799,6 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the thread pool. TAO_Thread_Pool *thread_pool = 0; @@ -837,7 +830,6 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the thread pool. TAO_Thread_Pool *thread_pool = 0; @@ -860,9 +852,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, } RTCORBA::ThreadpoolId -TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool - ) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); @@ -913,9 +903,7 @@ TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ) TAO_THREAD_POOL_MANAGER_GUARD; TAO_Thread_Pool *thread_pool = 0; - int result = - thread_pools_.find (thread_pool_id, - thread_pool); + int const result = thread_pools_.find (thread_pool_id, thread_pool); ACE_UNUSED_ARG (result); diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index f68dd67cd98..21009c2d2a4 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -383,8 +383,7 @@ public: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_Time_Value const &dynamic_thread_idle_timeout); /// Create a threadpool with lanes. RTCORBA::ThreadpoolId @@ -395,14 +394,11 @@ public: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Destroy a threadpool. void destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ) - ACE_THROW_SPEC ((CORBA::SystemException, - RTCORBA::RTORB::InvalidThreadpool)); + ); TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id); @@ -429,8 +425,7 @@ private: CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_Time_Value const &dynamic_thread_idle_timeout); RTCORBA::ThreadpoolId create_threadpool_with_lanes_i (CORBA::ULong stacksize, @@ -440,12 +435,10 @@ private: CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, ACE_Time_Value const &dynamic_thread_idle_timeout - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); RTCORBA::ThreadpoolId - create_threadpool_helper (TAO_Thread_Pool *thread_pool) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_threadpool_helper (TAO_Thread_Pool *thread_pool); // @} diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 8d9b2027b4d..0145c706d44 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -9,7 +9,6 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/Server_Strategy_Factory.h" -#include "tao/Environment.h" #include "tao/Exception.h" #include "tao/Stub.h" #include "tao/Policy_Manager.h" @@ -96,8 +95,7 @@ TAO_RT_POA::new_POA (const String &name, } void -TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies - ) +TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies) { { CORBA::Policy_var policy = @@ -527,9 +525,6 @@ TAO_RT_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name, poa_manager, @@ -542,8 +537,6 @@ PortableServer::POA_ptr TAO_RT_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name, activate_it @@ -555,7 +548,6 @@ void TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::destroy (etherealize_objects, wait_for_completion @@ -568,7 +560,6 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects, PortableServer::ThreadPolicy_ptr TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ThreadPolicy_ptr policy = this->TAO_Regular_POA::create_thread_policy (value @@ -582,7 +573,6 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value PortableServer::LifespanPolicy_ptr TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::LifespanPolicy_ptr policy = this->TAO_Regular_POA::create_lifespan_policy (value @@ -595,7 +585,6 @@ TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value PortableServer::IdUniquenessPolicy_ptr TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdUniquenessPolicy_ptr policy = this->TAO_Regular_POA::create_id_uniqueness_policy (value @@ -608,7 +597,6 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue PortableServer::IdAssignmentPolicy_ptr TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdAssignmentPolicy_ptr policy = this->TAO_Regular_POA::create_id_assignment_policy (value @@ -623,7 +611,6 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue PortableServer::ImplicitActivationPolicy_ptr TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ImplicitActivationPolicy_ptr policy = this->TAO_Regular_POA::create_implicit_activation_policy (value @@ -634,7 +621,6 @@ TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivatio PortableServer::ServantRetentionPolicy_ptr TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ServantRetentionPolicy_ptr policy = this->TAO_Regular_POA::create_servant_retention_policy (value @@ -646,7 +632,6 @@ TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPol PortableServer::RequestProcessingPolicy_ptr TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::RequestProcessingPolicy_ptr policy = this->TAO_Regular_POA::create_request_processing_policy (value @@ -658,7 +643,6 @@ TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingP char * TAO_RT_POA::the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { char * name = this->TAO_Regular_POA::the_name (); @@ -667,7 +651,6 @@ TAO_RT_POA::the_name (void) PortableServer::POA_ptr TAO_RT_POA::the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr parent = this->TAO_Regular_POA::the_parent (); @@ -676,7 +659,6 @@ TAO_RT_POA::the_parent (void) PortableServer::POAList * TAO_RT_POA::the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList *children = this->TAO_Regular_POA::the_children (); @@ -685,7 +667,6 @@ TAO_RT_POA::the_children (void) PortableServer::POAManager_ptr TAO_RT_POA::the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAManager_ptr poa_manager = this->TAO_Regular_POA::the_POAManager (); @@ -697,7 +678,6 @@ TAO_RT_POA::the_POAManager (void) PortableServer::AdapterActivator_ptr TAO_RT_POA::the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::AdapterActivator_ptr activator = this->TAO_Regular_POA::the_activator (); @@ -707,7 +687,6 @@ TAO_RT_POA::the_activator (void) void TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::the_activator (adapter_activator ); @@ -715,8 +694,6 @@ TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activato PortableServer::ServantManager_ptr TAO_RT_POA::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { PortableServer::ServantManager_ptr servant_manager = this->TAO_Regular_POA::get_servant_manager (); @@ -726,8 +703,6 @@ TAO_RT_POA::get_servant_manager (void) void TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant_manager (imgr ); @@ -735,9 +710,6 @@ TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr PortableServer::Servant TAO_RT_POA::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::get_servant (); @@ -747,8 +719,6 @@ TAO_RT_POA::get_servant (void) void TAO_RT_POA::set_servant (PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant (servant ); @@ -759,9 +729,6 @@ TAO_RT_POA::set_servant (PortableServer::Servant servant PortableServer::ObjectId * TAO_RT_POA::activate_object (PortableServer::Servant p_servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::activate_object (p_servant @@ -774,10 +741,6 @@ void TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::activate_object_with_id (id, p_servant @@ -788,9 +751,6 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id, void TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::deactivate_object (oid ); @@ -799,8 +759,6 @@ TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid CORBA::Object_ptr TAO_RT_POA::create_reference (const char *intf ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference (intf @@ -812,7 +770,6 @@ CORBA::Object_ptr TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference_with_id (oid, @@ -824,9 +781,6 @@ TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid, PortableServer::ObjectId * TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::servant_to_id (p_servant @@ -837,9 +791,6 @@ TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant CORBA::Object_ptr TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::servant_to_reference (p_servant @@ -851,10 +802,6 @@ TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant PortableServer::Servant TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::reference_to_servant (reference @@ -865,9 +812,6 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference PortableServer::ObjectId * TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::reference_to_id (reference @@ -878,9 +822,6 @@ TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference PortableServer::Servant TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::id_to_servant (oid @@ -891,9 +832,6 @@ TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid CORBA::Object_ptr TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::id_to_reference (oid @@ -903,7 +841,6 @@ TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid CORBA::OctetSeq * TAO_RT_POA::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->TAO_Regular_POA::id (); } diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 1cf913567bf..41a73486008 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -53,191 +53,119 @@ public: // RTCORBA specific methods CORBA::Object_ptr create_reference_with_priority (const char * intf, - RTCORBA::Priority priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + RTCORBA::Priority priority); CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid, const char * intf, - RTCORBA::Priority priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + RTCORBA::Priority priority); PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant, - RTCORBA::Priority priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + RTCORBA::Priority priority); void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, - RTCORBA::Priority priority) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + RTCORBA::Priority priority); // End RTCORBA specific methods // Standard POA interface methods PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)); + const CORBA::PolicyList &policies); PortableServer::POA_ptr find_POA (const char *adapter_name, - CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)); + CORBA::Boolean activate_it); void destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean wait_for_completion); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr create_thread_policy ( - PortableServer::ThreadPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ThreadPolicyValue value); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - PortableServer::LifespanPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::LifespanPolicyValue value); #endif #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( - PortableServer::IdUniquenessPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::IdUniquenessPolicyValue value); #endif #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( - PortableServer::IdAssignmentPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::IdAssignmentPolicyValue value); #endif #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - PortableServer::ImplicitActivationPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ImplicitActivationPolicyValue value); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( - PortableServer::ServantRetentionPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ServantRetentionPolicyValue value); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( - PortableServer::RequestProcessingPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::RequestProcessingPolicyValue value); #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * the_name (void); - PortableServer::POA_ptr the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr the_parent (void); - PortableServer::POAList *the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAList *the_children (void); - PortableServer::POAManager_ptr the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAManager_ptr the_POAManager (void); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::AdapterActivator_ptr the_activator (void); - void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) - ACE_THROW_SPEC ((CORBA::SystemException)); + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - PortableServer::ServantManager_ptr get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::ServantManager_ptr get_servant_manager (void); - void set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant (void); - void set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant (PortableServer::Servant servant); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant); #if !defined (CORBA_E_MICRO) void activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant p_servant); #endif - void deactivate_object (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + void deactivate_object (const PortableServer::ObjectId &oid); - CORBA::Object_ptr create_reference (const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + CORBA::Object_ptr create_reference (const char *intf); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, - const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException)); - - PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); - - PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); - - PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); - - PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::OctetSeq *id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *intf); + + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant); + + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant); + + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference); + + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference); + + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid); + + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); + + CORBA::OctetSeq *id (void); // End standard POA interface methods. diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl index 8a50bd7f91e..6ae1dc2512a 100644 --- a/TAO/tao/RTPortableServer/RT_POA.inl +++ b/TAO/tao/RTPortableServer/RT_POA.inl @@ -5,7 +5,6 @@ // Exception macros #include "tao/PortableServer/poa_macros.h" #include "tao/PortableServer/POA_Guard.h" -#include "tao/Environment.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -13,8 +12,6 @@ ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_priority (const char * intf, RTCORBA::Priority priority ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. this->validate_policies (); @@ -34,8 +31,6 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI const char * intf, RTCORBA::Priority priority ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. this->validate_policies (); @@ -55,9 +50,6 @@ ACE_INLINE PortableServer::ObjectId * TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, RTCORBA::Priority priority ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. this->validate_policies (); @@ -92,10 +84,6 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId PortableServer::Servant servant, RTCORBA::Priority priority ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. this->validate_policies (); diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 08c4b896d8b..96c16d2ce44 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -34,8 +34,7 @@ TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void) } void -TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies - ) +TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies) { this->validate_thread_pool (policies); @@ -55,15 +54,13 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) } void -TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies - ) +TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies) { // Make sure we have an endpoint for at least one of the protocols // specified in the RTCORBA::ServerProtocolPolicy. This ensure we // will be able to create non-nil object references. CORBA::Policy_var protocol = - policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ); + policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL); if (CORBA::is_nil (protocol.in ())) { diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 3004c66deab..733042d926c 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -72,8 +72,6 @@ TAO_RTScheduler_Current::begin_scheduling_segment ( const char * name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -103,8 +101,6 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param ) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -119,7 +115,6 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name, void TAO_RTScheduler_Current::end_scheduling_segment (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -137,7 +132,6 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name) RTScheduling::DistributableThread_ptr TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::DistributableThread_var DT; int result = this->dt_hash_.find (id, @@ -159,7 +153,6 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, RTCORBA::Priority base_priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -178,7 +171,6 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start, RTScheduling::Current::IdType * TAO_RTScheduler_Current::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -190,7 +182,6 @@ TAO_RTScheduler_Current::id (void) CORBA::Policy_ptr TAO_RTScheduler_Current::scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -203,7 +194,6 @@ TAO_RTScheduler_Current::scheduling_parameter (void) CORBA::Policy_ptr TAO_RTScheduler_Current::implicit_scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -215,7 +205,6 @@ TAO_RTScheduler_Current::implicit_scheduling_parameter (void) RTScheduling::Current::NameList * TAO_RTScheduler_Current::current_scheduling_segment_names (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -227,14 +216,12 @@ TAO_RTScheduler_Current::current_scheduling_segment_names (void) RTCORBA::Priority TAO_RTScheduler_Current::the_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->rt_current_->the_priority (); } void TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->rt_current_->the_priority(the_priority); } @@ -330,8 +317,6 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( const char * name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { // Check if it is a new Scheduling Segmnet if (this->guid_.length () == 0) @@ -420,8 +405,6 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param ) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { // Check if DT has been cancelled if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) @@ -444,7 +427,6 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, void TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if DT has been cancelled if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) @@ -494,7 +476,6 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, CORBA::ULong stack_size, RTCORBA::Priority base_priority ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if DT has been cancelled. if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) @@ -650,7 +631,6 @@ DTTask::svc (void) RTScheduling::Current::IdType * TAO_RTScheduler_Current_i::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::IdType_var guid = this->guid_; @@ -660,21 +640,18 @@ TAO_RTScheduler_Current_i::id (void) CORBA::Policy_ptr TAO_RTScheduler_Current_i::scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Policy::_duplicate (this->sched_param_); } CORBA::Policy_ptr TAO_RTScheduler_Current_i::implicit_scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Policy::_duplicate (this->implicit_sched_param_); } RTScheduling::Current::NameList * TAO_RTScheduler_Current_i::current_scheduling_segment_names (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::NameList* name_list; ACE_NEW_RETURN (name_list, @@ -705,7 +682,6 @@ TAO_RTScheduler_Current_i::name (void) void TAO_RTScheduler_Current_i::cancel_thread (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { size_t guid; ACE_OS::memcpy (&guid, diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index 0cdc365d86c..8a680b0353d 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -87,34 +87,26 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current void init (TAO_ORB_Core* orb); - virtual RTCORBA::Priority the_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RTCORBA::Priority the_priority (void); - virtual void the_priority (RTCORBA::Priority the_priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void the_priority (RTCORBA::Priority the_priority); void rt_current (RTCORBA::Current_ptr rt_current); virtual void begin_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); - virtual void end_scheduling_segment (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void end_scheduling_segment (const char * name); virtual RTScheduling::DistributableThread_ptr - lookup(const RTScheduling::Current::IdType & id) - ACE_THROW_SPEC ((CORBA::SystemException)); + lookup(const RTScheduling::Current::IdType & id); // returns a null reference if // the distributable thread is @@ -127,21 +119,16 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, - RTCORBA::Priority base_priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::Priority base_priority); - virtual ::RTScheduling::Current::IdType *id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::RTScheduling::Current::IdType *id (void); - virtual ::CORBA::Policy_ptr scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::CORBA::Policy_ptr scheduling_parameter (void); - virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (void); virtual ::RTScheduling::Current::NameList * - current_scheduling_segment_names (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + current_scheduling_segment_names (void); TAO_RTScheduler_Current_i* implementation (void); @@ -254,48 +241,37 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, - RTCORBA::Priority base_priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + RTCORBA::Priority base_priority); virtual void begin_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); - virtual void end_scheduling_segment (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void end_scheduling_segment (const char * name); - virtual RTScheduling::Current::IdType *id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RTScheduling::Current::IdType *id (void); void id (RTScheduling::Current::IdType guid); - virtual CORBA::Policy_ptr scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr scheduling_parameter (void); - virtual CORBA::Policy_ptr implicit_scheduling_parameter (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr implicit_scheduling_parameter (void); void scheduling_parameter (CORBA::Policy_ptr); void implicit_scheduling_parameter (CORBA::Policy_ptr); virtual RTScheduling::Current::NameList * - current_scheduling_segment_names (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + current_scheduling_segment_names (void); - void cancel_thread (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void cancel_thread (void); void cleanup_DT (void); diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp index db091728591..7d8a6a0dc1f 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.cpp +++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp @@ -16,14 +16,12 @@ TAO_DistributableThread::~TAO_DistributableThread (void) void TAO_DistributableThread::cancel (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->state_ = RTScheduling::DistributableThread::CANCELLED; } RTScheduling::DistributableThread::DT_State TAO_DistributableThread::state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->state_; } diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h index 8fc2dca562a..4840d1a9d42 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.h +++ b/TAO/tao/RTScheduling/Distributable_Thread.h @@ -19,11 +19,9 @@ class TAO_RTScheduler_Export TAO_DistributableThread: ~TAO_DistributableThread (void); - virtual void cancel (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (void); - virtual RTScheduling::DistributableThread::DT_State state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RTScheduling::DistributableThread::DT_State state (void); private: RTScheduling::DistributableThread::DT_State state_; diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index b88594c4c84..6bc9295d07f 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -25,7 +25,6 @@ static TAO_RTScheduler_Current_var current_cleanup; void TAO_RTScheduler_ORB_Initializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // // Register all of the RT related services. @@ -127,7 +126,6 @@ void void TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ This is busted. TAO_ORBInitInfo should do proper reference diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h index 09bf03a1c91..47c5ab040f3 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h @@ -43,11 +43,9 @@ class TAO_RTScheduler_ORB_Initializer , public virtual TAO_Local_RefCounted_Object { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: TAO_RTScheduler_Current* current_; diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index 1cca5d0c1e9..c6a87ee70b6 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -23,8 +23,6 @@ Client_Interceptor::SchedulingInfo = 30; void Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -118,7 +116,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) void Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -138,7 +135,6 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) void Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -158,8 +154,6 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri void Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -216,8 +210,6 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt void Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -237,14 +229,12 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri char* Client_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("RTSchdeuler_Client_Interceptor"); } void Client_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -259,8 +249,6 @@ Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current) void Server_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -271,8 +259,6 @@ Server_Interceptor::receive_request_service_contexts ( void Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -283,8 +269,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr try { serv_cxt = - ri->get_request_service_context (Server_Interceptor::SchedulingInfo - ); + ri->get_request_service_context (Server_Interceptor::SchedulingInfo); } catch (const ::CORBA::Exception&) { @@ -374,9 +359,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr } void -Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ) - ACE_THROW_SPEC ((CORBA::SystemException)) +Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -423,10 +406,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri } void -Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) +Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -449,10 +429,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r } void -Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) +Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -476,16 +453,13 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri char* Server_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("RTSchdeuler_Server_Interceptor"); } void Server_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 194a03cccdc..bc476915dd2 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -26,31 +26,21 @@ public: // Client_Interceptor (RTScheduling::Current_ptr current); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + ); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual char* name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char* name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); static const IOP::ServiceId SchedulingInfo; @@ -64,30 +54,19 @@ class TAO_RTScheduler_Export Server_Interceptor : public: Server_Interceptor (TAO_RTScheduler_Current_ptr current); - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual char* name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char* name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); static const IOP::ServiceId SchedulingInfo; diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index 62af6e4cbde..268222087ca 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -20,7 +20,7 @@ public RTScheduling::ThreadAction, virtual void do (CORBA::VoidData data ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index ad5ada04b04..ff155ac70c2 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -10,6 +10,7 @@ #include "tao/ORB_Core.h" #include "tao/Protocols_Hooks.h" #include "tao/debug.h" +#include "tao/SystemException.h" ACE_RCSID (tao, Remote_Invocation, @@ -96,14 +97,11 @@ namespace TAO target_spec.target_specifier (*ior_info, index); break; } - - } void Remote_Invocation::write_header (TAO_Target_Specification &spec, - TAO_OutputCDR &out_stream - ) + TAO_OutputCDR &out_stream) { this->resolver_.transport ()->clear_translators (0, &out_stream); diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h index 066cb23f624..ce45b946d6b 100644 --- a/TAO/tao/Remote_Invocation.h +++ b/TAO/tao/Remote_Invocation.h @@ -15,14 +15,13 @@ #define TAO_REMOTE_INVOCATION_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/Invocation_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Invocation_Base.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Operation_Details; diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h index e70b0f2f81a..559993dfe33 100644 --- a/TAO/tao/Request_Dispatcher.h +++ b/TAO/tao/Request_Dispatcher.h @@ -18,13 +18,12 @@ #include /**/ "ace/pre.h" -#include "tao/SystemException.h" +#include "tao/Objref_VarOut_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Objref_VarOut_T.h" #include "tao/Pseudo_VarOut_T.h" diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index d429a356686..14d2abc13bc 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter.h @@ -24,8 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" -#include "tao/SystemException.h" +#include "tao/orbconf.h" +#include "tao/Basic_Types.h" #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 # include "tao/OctetSeqC.h" @@ -154,13 +154,11 @@ namespace TAO virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0; - virtual void deallocate_pi_current ( - TAO::PICurrent_Impl *picurrent) = 0; + virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent) = 0; virtual void execute_command ( TAO_ServerRequest &server_request, - TAO::Upcall_Command &command - ) = 0; + TAO::Upcall_Command &command) = 0; }; } diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h index e97987173d6..1269b8c41f0 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" - +#include /**/ "tao/TAO_Export.h" +#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index c4a865fb9f2..6f94f428b87 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -18,14 +18,14 @@ #define TAO_SERVICE_CALLBACK_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/TAO_Export.h" -#include "tao/Basic_Types.h" #include "tao/Invocation_Utils.h" #include "tao/Object.h" #include "tao/Service_Context.h" diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h index d1e1905d8f6..2ba8d73aa99 100644 --- a/TAO/tao/Services_Activate.h +++ b/TAO/tao/Services_Activate.h @@ -23,7 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" +#include /**/ "tao/TAO_Export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -53,8 +54,7 @@ public: * This method cannot throw any exception, but it can return a nil * object to indicate an error condition. */ - virtual TAO_Service_Callbacks* activate_services (TAO_ORB_Core *orb) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + virtual TAO_Service_Callbacks* activate_services (TAO_ORB_Core *orb) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp index d3f2eead383..d986c4e9b24 100644 --- a/TAO/tao/Strategies/COIOP_Connector.cpp +++ b/TAO/tao/Strategies/COIOP_Connector.cpp @@ -8,6 +8,7 @@ #include "ace/Connector.h" #include "tao/debug.h" #include "tao/ORB_Core.h" +#include "tao/SystemException.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp index 39d6804470e..c17426ef1c6 100644 --- a/TAO/tao/Strategies/COIOP_Profile.cpp +++ b/TAO/tao/Strategies/COIOP_Profile.cpp @@ -5,7 +5,7 @@ #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0) #include "tao/CDR.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index c70dc9ff725..61011bc8bb7 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -9,7 +9,7 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 246a505e5ce..8fc849e1868 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -5,7 +5,7 @@ #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) #include "tao/CDR.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 9708dbdffd2..a60ed33ad4b 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -10,6 +10,7 @@ #include "tao/ORB_Core.h" #include "tao/Transport.h" #include "tao/Profile_Transport_Resolver.h" +#include "tao/SystemException.h" ACE_RCSID (tao, Optimized_Connection_Endpoint_Selector, diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 20127b267e3..da977043497 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -6,7 +6,7 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" #include "tao/Transport_Cache_Manager.h" diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 72e9a609a1d..a8655da4f71 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -6,7 +6,7 @@ #if TAO_HAS_SCIOP == 1 #include "tao/CDR.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 1ac25106500..6e4e621d82b 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -11,7 +11,7 @@ #include "tao/Base_Transport_Property.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Blocked_Connect_Strategy.h" diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 04786b75501..998bb2175bc 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -3,7 +3,7 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/CDR.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index fd9891fcd6a..9fd67d0804b 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -5,7 +5,7 @@ #include "tao/Strategies/UIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/Protocols_Hooks.h" #include "tao/Base_Transport_Property.h" #include "tao/Transport_Cache_Manager.h" diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 9556bcca35a..8b37bb457d5 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -5,7 +5,7 @@ #include "tao/Strategies/uiop_endpointsC.h" #include "tao/CDR.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 5b90664bf58..29802a00e39 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -24,6 +24,7 @@ #endif /* ! __ACE_INLINE__ */ #include "ace/Auto_Ptr.h" +#include "ace/CORBA_macros.h" ACE_RCSID (tao, diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 10792070575..34e957bdbba 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -14,6 +14,7 @@ #include "tao/Messaging_SyncScopeC.h" #include "tao/ORB_Core.h" #include "tao/Service_Context.h" +#include "tao/SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 # include "tao/PortableInterceptorC.h" @@ -51,7 +52,6 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::remote_twoway (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { ACE_Countdown_Time countdown (max_wait_time); @@ -226,7 +226,6 @@ namespace TAO Synch_Twoway_Invocation::wait_for_reply (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd, TAO_Bind_Dispatcher_Guard &bd) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* * Precondition: The call went to the remote @@ -415,7 +414,6 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::location_forward (TAO_InputCDR &inp_stream) - ACE_THROW_SPEC ((CORBA::SystemException)) { Reply_Guard mon (this, TAO_INVOKE_FAILURE); @@ -446,7 +444,6 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::handle_user_exception (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::Exception)) { Reply_Guard mon (this, TAO_INVOKE_FAILURE); @@ -494,7 +491,6 @@ namespace TAO Invocation_Status Synch_Twoway_Invocation::handle_system_exception (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::SystemException)) { Reply_Guard mon (this, TAO_INVOKE_FAILURE); @@ -611,7 +607,6 @@ namespace TAO Invocation_Status Synch_Oneway_Invocation::remote_oneway (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { ACE_Countdown_Time countdown (max_wait_time); diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index d3b711d460e..58aa96774c6 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; @@ -80,8 +80,7 @@ namespace TAO * invocation. This method is also nerve centre for the * interceptor invocation points. */ - Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time); protected: @@ -91,17 +90,14 @@ namespace TAO * example the DII needs a totally different method of * user exception exception handling */ - virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::Exception)); + virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr); /// Helper method used to handle location forwarded replies. - Invocation_Status location_forward (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::SystemException)); + Invocation_Status location_forward (TAO_InputCDR &cdr); /// Helper method used to handle system exceptions from the remote /// objects. - Invocation_Status handle_system_exception (TAO_InputCDR &cdr) - ACE_THROW_SPEC ((CORBA::SystemException)); + Invocation_Status handle_system_exception (TAO_InputCDR &cdr); /// As the name suggests waits for a reply from the remote ORB. /** @@ -109,8 +105,7 @@ namespace TAO */ Invocation_Status wait_for_reply (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd, - TAO_Bind_Dispatcher_Guard &bd) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO_Bind_Dispatcher_Guard &bd); private: @@ -159,8 +154,7 @@ namespace TAO /// Method used by the adapter to kickstart an oneway invocation /// to the remote object. - Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time); }; /** diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index b1da978276e..d0057eb1186 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -28,7 +28,6 @@ #include "tao/Exception.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 48955aa1b81..30df4693a83 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -14,16 +14,15 @@ #define TAO_THREAD_LANE_RESOURCES_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Thread_Mutex.h" - #include /**/ "tao/TAO_Export.h" -#include "tao/orbconf.h" #include "tao/params.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index 812108edd14..011a4c9468c 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -14,14 +14,12 @@ #define TAO_THREAD_LANE_RESOURCES_MANAGER_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" - #include /**/ "tao/TAO_Export.h" #include /**/ "tao/Versioned_Namespace.h" diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 985ea018653..54fd38db5f0 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -22,12 +22,14 @@ #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "tao/MMAP_Allocator.h" +#include "tao/SystemException.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdio.h" #include "ace/Reactor.h" #include "ace/os_include/sys/os_uio.h" #include "ace/High_Res_Timer.h" +#include "ace/CORBA_macros.h" /* * Specialization hook to add include files from diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp index 7fa3bae6832..e14dccf18ad 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/Current_Impl.cpp @@ -42,7 +42,6 @@ namespace TAO /// thread. const TAO_Transport* Current_Impl::transport (void) const - ACE_THROW_SPEC ((NoContext)) { Transport_Selection_Guard* topguard = Transport_Selection_Guard::current (this->core_, this->tss_slot_id_); @@ -56,7 +55,6 @@ namespace TAO /// Obtains the current transport's stats const TAO::Transport::Stats* Current_Impl::transport_stats (void) const - ACE_THROW_SPEC ((NoContext)) { static const TAO::Transport::Stats dummy; @@ -66,7 +64,6 @@ namespace TAO } CORBA::Long Current_Impl::id (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { const TAO_Transport* t = this->transport (); @@ -74,31 +71,26 @@ namespace TAO } CounterT Current_Impl::bytes_sent (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->bytes_sent (); } CounterT Current_Impl::bytes_received (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->bytes_received (); } CounterT Current_Impl::messages_sent (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->messages_sent (); } CounterT Current_Impl::messages_received (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { return transport_stats ()->messages_received (); } TimeBase::TimeT Current_Impl::open_since (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { TimeBase::TimeT msecs = 0; transport_stats ()->opened_since ().msec (msecs); diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h index 9463b35c01c..4fefe078e3f 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.h +++ b/TAO/tao/TransportCurrent/Current_Impl.h @@ -49,23 +49,17 @@ namespace TAO * PortableInterceptor::Current interface. */ //@{ - virtual CORBA::Long id (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual CORBA::Long id (void); - virtual CounterT bytes_sent (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual CounterT bytes_sent (void); - virtual CounterT bytes_received (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual CounterT bytes_received (void); - virtual CounterT messages_sent (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual CounterT messages_sent (void); - virtual CounterT messages_received (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual CounterT messages_received (void); - virtual ::TimeBase::TimeT open_since (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual ::TimeBase::TimeT open_since (void); //@} protected: @@ -75,14 +69,12 @@ namespace TAO */ //@{ /// A (strategy) method used to obtain the transport ptr - const TAO_Transport* transport (void) const - ACE_THROW_SPEC ((NoContext)); + const TAO_Transport* transport (void) const; /// A Stats instance. If protocol is unavailable (0) or the /// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but /// 1, a single static instance will be used. - const TAO::Transport::Stats* transport_stats (void) const - ACE_THROW_SPEC ((NoContext)); + const TAO::Transport::Stats* transport_stats (void) const; //@} /// Destructor is protected to enforce the fact this class is diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp index 61300fa35aa..be55fa69b0a 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp @@ -28,7 +28,6 @@ namespace TAO TAO::Transport::Current_ptr Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the Current Current_ptr tmp = 0; diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h index 516c6205c02..34487cd14a3 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h @@ -38,8 +38,7 @@ namespace TAO protected: virtual TAO::Transport::Current_ptr - make_current_instance (TAO_ORB_Core* c, size_t s) - ACE_THROW_SPEC ((CORBA::SystemException)); + make_current_instance (TAO_ORB_Core* c, size_t s); }; } } diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp index 816f99d153c..aeae2652ebc 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp @@ -26,7 +26,6 @@ namespace TAO void Current_ORBInitializer_Base::pre_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. @@ -62,7 +61,6 @@ namespace TAO void Current_ORBInitializer_Base::post_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC( (CORBA::SystemException) ) { // do nothing } diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h index d2e10d98e36..d92da1f47b7 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h @@ -42,15 +42,13 @@ namespace TAO Current_ORBInitializer_Base (const ACE_TCHAR* id); virtual ~Current_ORBInitializer_Base (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); protected: virtual TAO::Transport::Current_ptr make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; protected: const ACE_TString id_; }; diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp index 7faecaeff6c..fa49fcf0104 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp @@ -4,6 +4,7 @@ #include "tao/IIOP_Connection_Handler.h" #include "tao/IIOP_Transport.h" #include "tao/Transport_Selection_Guard.h" +#include "tao/SystemException.h" #if TAO_HAS_TRANSPORT_CURRENT == 1 @@ -25,7 +26,6 @@ namespace TAO TAO_IIOP_Connection_Handler* IIOP_Current_Impl::handler (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) const TAO_Transport* t = this->transport (); @@ -59,7 +59,6 @@ namespace TAO CORBA::Long IIOP_Current_Impl::id (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) // Need to use cast to pacify windows compilers complaining @@ -72,7 +71,6 @@ namespace TAO ::SSLIOP::Current_ptr IIOP_Current_Impl::ssliop_current (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { throw ::CORBA::NO_IMPLEMENT (); } @@ -80,7 +78,6 @@ namespace TAO CORBA::Long IIOP_Current_Impl::remote_port (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -97,7 +94,6 @@ namespace TAO char* IIOP_Current_Impl::remote_host (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -114,7 +110,6 @@ namespace TAO CORBA::Long IIOP_Current_Impl::local_port (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -131,7 +126,6 @@ namespace TAO char* IIOP_Current_Impl::local_host (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h index acb48edcbe2..0495f17b6f4 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h @@ -51,23 +51,17 @@ namespace TAO IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id); //@{ - virtual ::CORBA::Long id (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual ::CORBA::Long id (void); - virtual ::SSLIOP::Current_ptr ssliop_current (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual ::SSLIOP::Current_ptr ssliop_current (void); - virtual ::CORBA::Long remote_port (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual ::CORBA::Long remote_port (void); - virtual char* remote_host (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual char* remote_host (void); - virtual ::CORBA::Long local_port (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual ::CORBA::Long local_port (void); - virtual char* local_host (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + virtual char* local_host (void); //@} @@ -87,8 +81,7 @@ namespace TAO /// Transport. Will throw NO_IMPLEMENT if the (selected) transport /// () == 0, or if transport->connection_handler () == 0. Will /// throw NoContext, if no transport has been selected yet. - TAO_IIOP_Connection_Handler* handler (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)); + TAO_IIOP_Connection_Handler* handler (void); private: diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 8de3a02fcbb..ca9029f86ab 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -17,14 +17,13 @@ #define TAO_CONNECTOR_H #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/TAO_Export.h" -#include "tao/Basic_Types.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index 96f3deac271..910f4ae7953 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -21,14 +21,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Environment.h" - -/* #include "tao/Policy_Current_Impl.h" */ +#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations class TAO_Transport; +class TAO_ORB_Core; namespace TAO { diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index d44213c910c..2453262a6f6 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -23,7 +23,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( const char * id, const char * name, const CORBA::StructMemberSeq & members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -36,7 +35,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( const char * name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq & members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -48,7 +46,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( const char * id, const char * name, const CORBA::EnumMemberSeq & members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -60,7 +57,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( const char * id, const char * name, CORBA::TypeCode_ptr original_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -72,7 +68,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( const char * id, const char * name, const CORBA::StructMemberSeq & members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -83,7 +78,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( const char * id, const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -92,7 +86,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -101,7 +94,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound) CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -112,7 +104,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -123,7 +114,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -134,7 +124,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -148,7 +137,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq & members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -160,7 +148,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( const char * id, const char * name, CORBA::TypeCode_ptr boxed_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -171,7 +158,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( const char * id, const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -180,7 +166,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -191,7 +176,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( const char * id, const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -202,7 +186,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( const char * id, const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -213,7 +196,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_component_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -224,7 +206,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_home_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -238,7 +219,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h index 961f84e4f09..2f60b63d946 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h @@ -45,112 +45,92 @@ public: virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::StructMemberSeq &members); virtual CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::UnionMemberSeq &members); virtual CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, - const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::EnumMemberSeq &members); virtual CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr original_type); virtual CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::StructMemberSeq &members); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_string_tc ( - CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong bound); virtual CORBA::TypeCode_ptr create_wstring_tc ( - CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong bound); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::UShort scale); virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr element_type); virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr element_type); virtual CORBA::TypeCode_ptr create_value_tc ( const char *id, const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ValueMemberSeq &members); virtual CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr boxed_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr boxed_type); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_recursive_tc ( - const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *id); virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_event_tc ( const char *id, const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ValueMemberSeq &members); /** * @name TAO-specific TypeCode factory methods. diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index beb07d97246..654417b0dfd 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -31,7 +31,6 @@ TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void) CORBA::Object_ptr TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * []) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h index e7b40eea848..de8be09f33a 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h @@ -41,8 +41,7 @@ public: /// of a TypeCodeFactory object. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv []) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index e45c72820ce..217ef0965a5 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -129,7 +129,6 @@ TAO_TypeCodeFactory_i::create_struct_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->struct_except_tc_common (id, name, @@ -143,7 +142,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -614,7 +612,6 @@ TAO_TypeCodeFactory_i::create_enum_tc ( const char *id, const char *name, const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -668,7 +665,6 @@ TAO_TypeCodeFactory_i::create_alias_tc ( const char *id, const char *name, CORBA::TypeCode_ptr original_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->alias_value_box_tc_common (id, name, @@ -681,7 +677,6 @@ TAO_TypeCodeFactory_i::create_exception_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->struct_except_tc_common (id, name, @@ -693,7 +688,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_interface_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, @@ -702,7 +696,6 @@ TAO_TypeCodeFactory_i::create_interface_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_string_tc (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->string_wstring_tc_common (bound, CORBA::tk_string); @@ -710,7 +703,6 @@ TAO_TypeCodeFactory_i::create_string_tc (CORBA::ULong bound) CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_wstring_tc (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->string_wstring_tc_common (bound, CORBA::tk_wstring); @@ -720,7 +712,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc; ACE_NEW_THROW_EX (tc, @@ -735,7 +726,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { return sequence_array_tc_common (bound, element_type, @@ -746,7 +736,6 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { return sequence_array_tc_common (length, element_type, CORBA::tk_array); } @@ -759,7 +748,6 @@ TAO_TypeCodeFactory_i::create_value_tc ( CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_event_tc_common (id, name, @@ -776,7 +764,6 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( const char *name, CORBA::TypeCode_ptr boxed_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->alias_value_box_tc_common (id, name, @@ -790,7 +777,6 @@ TAO_TypeCodeFactory_i::create_native_tc ( const char *id, const char *name ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, @@ -800,7 +786,6 @@ TAO_TypeCodeFactory_i::create_native_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_recursive_tc (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -821,7 +806,6 @@ TAO_TypeCodeFactory_i::create_abstract_interface_tc ( const char *id, const char *name ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, @@ -834,7 +818,6 @@ TAO_TypeCodeFactory_i::create_local_interface_tc ( const char *id, const char *name ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, @@ -847,7 +830,6 @@ TAO_TypeCodeFactory_i::create_component_tc ( const char *id, const char *name ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, @@ -856,7 +838,6 @@ TAO_TypeCodeFactory_i::create_component_tc ( CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_home_tc (const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, @@ -870,7 +851,6 @@ TAO_TypeCodeFactory_i::create_event_tc ( CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_event_tc_common (id, name, @@ -1144,7 +1124,6 @@ TAO_TypeCodeFactory_i::create_tc_common ( CORBA::TCKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (name == 0 || !this->valid_name (name)) { @@ -1175,7 +1154,6 @@ TAO_TypeCodeFactory_i::string_wstring_tc_common ( CORBA::TCKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc; ACE_NEW_THROW_EX (tc, @@ -1193,7 +1171,6 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common ( CORBA::TCKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -1226,7 +1203,6 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( CORBA::TCKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -1333,7 +1309,6 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common ( CORBA::TypeCode_ptr underlying_type, CORBA::TCKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); @@ -1378,7 +1353,6 @@ TAO_TypeCodeFactory_i::value_event_tc_common ( CORBA::TCKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil (); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index 2d512cbf276..baa765a63ef 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -64,112 +64,92 @@ public: virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::StructMemberSeq &members); virtual CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::UnionMemberSeq &members); virtual CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, - const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::EnumMemberSeq &members); virtual CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr original_type); virtual CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::StructMemberSeq &members); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_string_tc ( - CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong bound); virtual CORBA::TypeCode_ptr create_wstring_tc ( - CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong bound); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::UShort scale); virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr element_type); virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr element_type); virtual CORBA::TypeCode_ptr create_value_tc ( const char *id, const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ValueMemberSeq &members); virtual CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr boxed_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr boxed_type); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_recursive_tc ( - const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *id); virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); virtual CORBA::TypeCode_ptr create_event_tc ( const char *id, const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ValueMemberSeq &members); private: /// Finds a legal default label value. @@ -182,37 +162,32 @@ private: CORBA::TypeCode_ptr create_tc_common ( const char *id, const char *name, - CORBA::TCKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TCKind kind); /// Code for strings and wstrings is identical except for TCKind. CORBA::TypeCode_ptr string_wstring_tc_common ( CORBA::ULong bound, - CORBA::TCKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TCKind kind); /// Code for arrays and sequences is identical except for TCKind. CORBA::TypeCode_ptr sequence_array_tc_common ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type, - CORBA::TCKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TCKind kind); /// Code for structs and unions is identical except for TCKind. CORBA::TypeCode_ptr struct_except_tc_common ( const char *id, const char *name, const CORBA::StructMemberSeq &members, - CORBA::TCKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TCKind kind); /// Code for aliases and boxed valuetypes is identical except for TCKind. CORBA::TypeCode_ptr alias_value_box_tc_common ( const char *id, const char *name, CORBA::TypeCode_ptr underlying_type, - CORBA::TCKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TCKind kind); CORBA::TypeCode_ptr value_event_tc_common ( const char *id, @@ -220,8 +195,7 @@ private: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members, - CORBA::TCKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TCKind kind); /// If any of these fail, we raise a spec-defined minor code /// of BAD_PARAM or BAD_TYPECODE. diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 9c954c7a864..d18d0f02106 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -20,9 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" -#include "tao/Environment.h" #include "tao/Typecode_typesC.h" +#include "tao/Pseudo_VarOut_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> class ACE_Array_Base; @@ -71,67 +70,50 @@ public: virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + const CORBA::StructMemberSeq &members) = 0; virtual CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + const CORBA::UnionMemberSeq &members) = 0; virtual CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, - const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + const CORBA::EnumMemberSeq &members) = 0; virtual CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type) + CORBA::TypeCode_ptr original_type) = 0; - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, - const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + const CORBA::StructMemberSeq &members) = 0; virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + const char *name) = 0; virtual CORBA::TypeCode_ptr create_string_tc ( - CORBA::ULong bound - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + CORBA::ULong bound) = 0; virtual CORBA::TypeCode_ptr create_wstring_tc ( - CORBA::ULong bound - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + CORBA::ULong bound) = 0; virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale - - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + CORBA::UShort scale) = 0; virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + CORBA::TypeCode_ptr element_type) = 0; virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + CORBA::TypeCode_ptr element_type) = 0; virtual CORBA::TypeCode_ptr create_value_tc ( const char *id, @@ -140,44 +122,44 @@ public: CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, CORBA::TypeCode_ptr boxed_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_recursive_tc ( const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::TypeCode_ptr create_event_tc ( const char *id, @@ -185,7 +167,7 @@ public: CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; // -- diff --git a/TAO/tao/Unbounded_Array_Sequence_T.h b/TAO/tao/Unbounded_Array_Sequence_T.h index 8dd16f2bb70..0fee7534ee0 100644 --- a/TAO/tao/Unbounded_Array_Sequence_T.h +++ b/TAO/tao/Unbounded_Array_Sequence_T.h @@ -12,7 +12,6 @@ #include "tao/Unbounded_Array_Allocation_Traits_T.h" #include "tao/Generic_Sequence_T.h" #include "tao/Array_Traits_T.h" -#include "tao/SystemException.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index 77bdef93629..ee925f249b9 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -12,6 +12,7 @@ */ #include "tao/orbconf.h" +#include "tao/CORBA_String.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp index b1799cf088b..cc40c5c1892 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.cpp +++ b/TAO/tao/Utils/Implicit_Deactivator.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Utils::Implicit_Deactivation_Functor::operator () ( PortableServer::ServantBase * servant) - ACE_THROW_SPEC (()) { try diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h index 68077296726..d2646599ad2 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.h +++ b/TAO/tao/Utils/Implicit_Deactivator.h @@ -39,8 +39,7 @@ namespace TAO typedef PortableServer::ServantBase * argument; // Deactivate an implicitly activated servant - void operator() (PortableServer::ServantBase * servant) - ACE_THROW_SPEC (()); + void operator() (PortableServer::ServantBase * servant); }; /** diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp index f21bef3f86d..7418bbd01fb 100644 --- a/TAO/tao/Utils/ORB_Destroyer.cpp +++ b/TAO/tao/Utils/ORB_Destroyer.cpp @@ -9,7 +9,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) - ACE_THROW_SPEC (()) { try { diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h index 920ba64d3e5..fac9de338ad 100644 --- a/TAO/tao/Utils/ORB_Destroyer.h +++ b/TAO/tao/Utils/ORB_Destroyer.h @@ -38,8 +38,7 @@ namespace TAO typedef CORBA::ORB_ptr argument; /// Destroy the ORB - void operator() (CORBA::ORB_ptr orb) - ACE_THROW_SPEC (()); + void operator() (CORBA::ORB_ptr orb); }; /** diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index e07ded0d198..9b349c66957 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -16,7 +16,6 @@ #include "tao/PortableServer/IdAssignmentPolicyC.h" #include "tao/PortableServer/LifespanPolicyC.h" -#include "tao/Environment.h" #include "tao/ORBInitializer_Registry.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp index a5acabe07da..46e5a6fdfe4 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.cpp +++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp @@ -1,5 +1,4 @@ #include "tao/Utils/PolicyList_Destroyer.h" -#include "tao/Environment.h" #if !defined (__ACE_INLINE__) # include "tao/Utils/PolicyList_Destroyer.inl" @@ -12,7 +11,6 @@ ACE_RCSID (Utils, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() - ACE_THROW_SPEC (()) { for (CORBA::ULong i = 0; i != length(); ++i) diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h index ef2ef408805..36f4aead23a 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.h +++ b/TAO/tao/Utils/PolicyList_Destroyer.h @@ -37,8 +37,7 @@ namespace TAO { public: PolicyList_Destroyer(CORBA::ULong length_hint); - ~PolicyList_Destroyer() - ACE_THROW_SPEC (()); + ~PolicyList_Destroyer(); }; } // namespace Utils diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h index ee6c34f4087..1492c97b2c8 100644 --- a/TAO/tao/Utils/Servant_Var.h +++ b/TAO/tao/Utils/Servant_Var.h @@ -22,8 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/CORBA_macros.h" -#include "tao/Environment.h" +#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -60,8 +59,7 @@ namespace TAO /// Destructor. Removes a reference from the underlying object, /// possibly destroying it. - ~Servant_Var() - ACE_THROW_SPEC (()); + ~Servant_Var(); /// Assignment operator. Assumes ownership of @c p. Servant_Var<T> & operator=(T * p); @@ -137,8 +135,7 @@ namespace TAO /** * Often used to implement strong exception safety. */ - void swap(Servant_Var<T> & rhs) - ACE_THROW_SPEC(()); + void swap(Servant_Var<T> & rhs); private: T * ptr_; diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index ca6e0e6f9bf..03b3f8c2e2a 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -75,7 +75,6 @@ TAO::Utils::Servant_Var<T>::operator= (T * p) template <class T> ACE_INLINE TAO::Utils::Servant_Var<T>::~Servant_Var (void) - ACE_THROW_SPEC (()) { // Unfortunately, there is no throw spec on _remove_ref, so we // can't assume that it will not throw. If it does, then we are in diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index 8ebddcab997..3ce3d5a9438 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -27,7 +27,6 @@ #include "tao/Objref_VarOut_T.h" #include "tao/Object.h" /* For CORBA::Object_var */ #include "tao/Pseudo_VarOut_T.h" -#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index e701faa9749..763d7515a3b 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -12,9 +12,9 @@ #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" -#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/Valuetype/ValueBase.inl" diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index b732014f8ca..95f46be0647 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -30,7 +30,6 @@ #include "tao/Any_Insert_Policy_T.h" #include "ace/Basic_Types.h" -#include "ace/CORBA_macros.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 6bfd4dd0c14..859a011e331 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -23,13 +23,11 @@ #include "tao/Valuetype/Value_VarOut_T.h" -#include "tao/Environment.h" #include "tao/Basic_Types.h" #include "tao/orbconf.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" #include "ace/Null_Mutex.h" -#include "ace/CORBA_macros.h" #include "ace/Atomic_Op.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp index 21093cf9ca7..1f987d36639 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp @@ -4,6 +4,7 @@ #include "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h" #include "tao/ORB_Core.h" +#include "tao/SystemException.h" ACE_RCSID (ValueType, Valuetype_Adapter_Factory_Impl, @@ -17,7 +18,6 @@ TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void) TAO_Valuetype_Adapter * TAO_Valuetype_Adapter_Factory_Impl::create (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Valuetype_Adapter_Impl *nva = 0; ACE_NEW_THROW_EX (nva, diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index 6cac11a715b..15d86b11251 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -45,8 +45,7 @@ public: virtual TAO_Valuetype_Adapter * create ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h index 3e1ab345ee0..e2e859fc57d 100644 --- a/TAO/tao/Valuetype_Adapter_Factory.h +++ b/TAO/tao/Valuetype_Adapter_Factory.h @@ -21,7 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/orbconf.h" +#include "tao/TAO_Export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -42,10 +43,7 @@ class TAO_Export TAO_Valuetype_Adapter_Factory public: virtual ~TAO_Valuetype_Adapter_Factory (void); - virtual TAO_Valuetype_Adapter * create ( - - ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + virtual TAO_Valuetype_Adapter * create (void) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 1fdf4a35e91..70c706f9629 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -42,7 +42,6 @@ #include /**/ "tao/TAO_Export.h" #include "tao/ORB.h" -#include "tao/Environment.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 880879e54ab..de697c78aad 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -22,7 +22,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Exception * TAO_Operation_Details::corba_exception (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i != this->ex_count_; ++i) { diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 1baf4c9b93e..61ad4d406e4 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -14,13 +14,12 @@ #include /**/ "ace/pre.h" -#include "tao/SystemException.h" +#include "tao/Service_Context.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Service_Context.h" #include "tao/TimeBaseC.h" #include "tao/target_specification.h" @@ -130,8 +129,7 @@ public: * is not found in the list of exceptions specified by the operation * this call would raise an UNKNOWN exception. */ - CORBA::Exception *corba_exception (const char *ex) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Exception *corba_exception (const char *ex); /// Check whether exception @a ex is in the signature of this operation bool has_exception (::CORBA::Exception& ex) const; |