diff options
Diffstat (limited to 'TAO/tao/IORInterceptor')
7 files changed, 15 insertions, 44 deletions
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 (); |