diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 18:48:28 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 18:48:28 +0000 |
commit | 135d9801bb9295a5a00a8f1305a47834574c7f8d (patch) | |
tree | 282cf3a34359375b67a5b5d8670c45a6f921beb6 /TAO | |
parent | c3e236eddbdacaa9dc4ec4b6509fae9438054d27 (diff) | |
download | ATCD-135d9801bb9295a5a00a8f1305a47834574c7f8d.tar.gz |
Diffstat (limited to 'TAO')
8 files changed, 15 insertions, 18 deletions
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index b27461c2904..5018baf02c4 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -728,8 +728,7 @@ void POA_CORBA::DomainManager::_interface_skel ( if (_tao_adapter == 0) { - throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, - CORBA::COMPLETED_NO)); + throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO); } POA_CORBA::DomainManager * const impl = diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp index 533e41bf9b5..f13233c81e9 100644 --- a/TAO/tao/PortableServer/POA_Guard.cpp +++ b/TAO/tao/PortableServer/POA_Guard.cpp @@ -21,12 +21,12 @@ namespace TAO : guard_ (poa.lock ()) { if (!this->guard_.locked ()) - throw ( + throw CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_GUARD_FAILURE, 0), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of @@ -35,12 +35,12 @@ namespace TAO if (check_for_destruction && poa.cleanup_in_progress ()) - throw ( + throw CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_POA_BEING_DESTROYED, 0), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } } } diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 87b89d5ab0e..38d9d2ffe71 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -888,8 +888,7 @@ void POA_CORBA::Policy::_interface_skel ( if (_tao_adapter == 0) { - throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, - CORBA::COMPLETED_NO)); + throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO); } POA_CORBA::Policy * const impl = diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 9cac90d9060..58d458e1442 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -39,7 +39,7 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } void @@ -49,7 +49,7 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 659bd6847a8..84f63fc75ab 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -52,7 +52,7 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } PortableServer::Servant diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 3295d72c44a..d383a2ddd89 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -42,7 +42,7 @@ namespace TAO { ACE_UNUSED_ARG (servant); - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } void @@ -54,8 +54,7 @@ namespace TAO // see 11.3.8.6 of the corba spec if (CORBA::is_nil (servant_manager)) { - throw ( ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 25adb27e1d9..94803862d60 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -53,7 +53,7 @@ namespace TAO { // When using Non_Retain we don't have an active object map and we just // can't deactivate any object - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } PortableServer::Servant @@ -206,7 +206,7 @@ namespace TAO PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)) { - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } #endif diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 1c71e6d4910..32d8f6856d7 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -214,7 +214,7 @@ TAO_RT_POA::validate_policies (void) if (this->cached_policies_.implicit_activation () == PortableServer::IMPLICIT_ACTIVATION) { - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } // For each of the above operations, if the POA does not support the @@ -223,7 +223,7 @@ TAO_RT_POA::validate_policies (void) if (this->cached_policies_.priority_model () != TAO::Portable_Server::Cached_Policies::SERVER_DECLARED) { - throw (PortableServer::POA::WrongPolicy ()); + throw PortableServer::POA::WrongPolicy (); } // In all other respects the semantics of the corresponding |