diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 18:43:15 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 18:43:15 +0000 |
commit | 9a1b8b84615cd2da2f35ee02582d47b401cad165 (patch) | |
tree | 63a393654b5f7742507e587788301641cded5f7e /TAO | |
parent | 5d48baca3dc57ec7bcd154cf0850362361799eaa (diff) | |
download | ATCD-9a1b8b84615cd2da2f35ee02582d47b401cad165.tar.gz |
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.cpp | 12 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging.cpp | 12 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_Policy_i.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/PI/ClientRequestInfo.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/PI/Interceptor_List_T.cpp | 13 | ||||
-rw-r--r-- | TAO/tao/PI/ORBInitInfo.cpp | 30 | ||||
-rw-r--r-- | TAO/tao/PI/ORBInitializer_Registry_Impl.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/PI/PICurrent.cpp | 9 | ||||
-rw-r--r-- | TAO/tao/PI/PolicyFactory_Registry.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/PI_Server/ServerRequestInfo.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Default_Policy_Validator.cpp | 11 | ||||
-rw-r--r-- | TAO/tao/PortableServer/POA_Policy_Set.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/RTPortableServer/RT_Policy_Validator.cpp | 18 |
14 files changed, 60 insertions, 74 deletions
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 1b020e6ab93..846a65647fd 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -95,11 +95,11 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) // request and is now trying to send back the reply. Hence we // say that the operation has completed but let the server // anyway that it is not doing something right. - throw ( ::CORBA::BAD_INV_ORDER + throw ::CORBA::BAD_INV_ORDER (CORBA::SystemException::_tao_minor_code (TAO_AMH_REPLY_LOCATION_CODE, EEXIST), - CORBA::COMPLETED_YES)); + CORBA::COMPLETED_YES); } } @@ -141,11 +141,11 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (void) // server-app saying it is not doing something right. if (this->reply_status_ != TAO_RS_INITIALIZED) { - throw ( ::CORBA::BAD_INV_ORDER ( + throw ::CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_AMH_REPLY_LOCATION_CODE, ENOTSUP), - CORBA::COMPLETED_YES)); + CORBA::COMPLETED_YES); } this->reply_status_ = TAO_RS_SENDING; } @@ -183,11 +183,11 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->reply_status_ != TAO_RS_UNINITIALIZED) { - throw ( ::CORBA::BAD_INV_ORDER ( + throw ::CORBA::BAD_INV_ORDER ( CORBA::SystemException::_tao_minor_code ( TAO_AMH_REPLY_LOCATION_CODE, ENOTSUP), - CORBA::COMPLETED_YES)); + CORBA::COMPLETED_YES); } this->reply_status_ = TAO_RS_SENDING; } diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index e2794ff2189..67dfb1386bc 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -98,7 +98,7 @@ namespace TAO if (rd == 0) { - throw ( ::CORBA::NO_MEMORY ()); + throw ::CORBA::NO_MEMORY (); } this->safe_rd_.reset (rd); diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index 8fe54a1426b..7c430ebeb62 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -45,8 +45,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, { // Could not demarshal the exception id, raise a local // CORBA::MARSHAL - throw ( ::CORBA::MARSHAL (TAO::VMCID, - CORBA::COMPLETED_YES)); + throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_YES); } if (is_system_exception) @@ -55,8 +54,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::ULong completion = 0; if ((_tao_in >> minor) == 0 || (_tao_in >> completion) == 0) - throw ( ::CORBA::MARSHAL (TAO::VMCID, - CORBA::COMPLETED_MAYBE)); + throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE); CORBA::SystemException* exception = TAO::create_system_exception (type_id.in ()); @@ -89,8 +87,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::Exception * const exception = exception_data[i].alloc (); if (exception == 0) - throw ( ::CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_YES)); + throw ::CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_YES); exception->_tao_decode (_tao_in); // Raise the exception. @@ -106,8 +103,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, // @@ It would seem like if the remote exception is a // UserException we can assume that the request was // completed. - throw ( ::CORBA::UNKNOWN (TAO::VMCID, - CORBA::COMPLETED_YES)); + throw ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 7eba31507a7..75c35affebb 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -253,11 +253,11 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, Messaging::SyncScopePolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) - throw ( ::CORBA::INTERNAL ( + throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_POLICY_NARROW_CODE, 0), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); has_synchronization = true; scope = p->synchronization (); diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index 93eff12f2fb..1bce119c9ee 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -345,8 +345,7 @@ TAO_ClientRequestInfo::add_request_service_context ( if (service_context_list.set_context (service_context, replace) == 0) { - throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO); } } @@ -682,8 +681,7 @@ void TAO_ClientRequestInfo::check_validity (void) { if (this->invocation_ == 0) - throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } void diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 55cb166bcad..ba15a78da6f 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -86,7 +86,7 @@ namespace TAO if (ACE_OS::strcmp (existing_name.in (), name.in ()) == 0) { - throw (PortableInterceptor::ORBInitInfo::DuplicateName ()); + throw PortableInterceptor::ORBInitInfo::DuplicateName (); } } } @@ -102,15 +102,13 @@ namespace TAO } else { - throw ( + throw CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL ), - CORBA::COMPLETED_NO - ) - ); + CORBA::COMPLETED_NO); } } @@ -160,7 +158,7 @@ namespace TAO if (ACE_OS::strcmp (existing_name.in (), name.in ()) == 0) { - throw (PortableInterceptor::ORBInitInfo::DuplicateName ()); + throw PortableInterceptor::ORBInitInfo::DuplicateName (); } } } @@ -183,14 +181,13 @@ namespace TAO } else { - throw ( + throw CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL ), CORBA::COMPLETED_NO - ) ); } } diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index e33f0f500c7..469fe4c1ba9 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -158,16 +158,15 @@ TAO_ORBInitInfo::register_initial_reference ( this->check_validity (); if (id == 0 || ACE_OS::strlen (id) == 0) - throw (PortableInterceptor::ORBInitInfo::InvalidName ()); + throw PortableInterceptor::ORBInitInfo::InvalidName (); if (CORBA::is_nil (obj)) - throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, CORBA::COMPLETED_NO); TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table (); if (table.register_initial_reference (id, obj) == -1) - throw (PortableInterceptor::ORBInitInfo::InvalidName ()); + throw PortableInterceptor::ORBInitInfo::InvalidName (); } CORBA::Object_ptr @@ -204,11 +203,11 @@ TAO_ORBInitInfo::add_client_request_interceptor ( this->orb_core_->add_interceptor (interceptor); #else ACE_UNUSED_ARG (interceptor); - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); #endif /* TAO_HAS_INTERCEPTORS == 1 */ } @@ -226,11 +225,11 @@ TAO_ORBInitInfo::add_server_request_interceptor ( #else ACE_UNUSED_ARG (interceptor); - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); #endif /* TAO_HAS_INTERCEPTORS == 1 */ } @@ -265,11 +264,11 @@ TAO_ORBInitInfo::add_client_request_interceptor_with_policy ( #else ACE_UNUSED_ARG (interceptor); ACE_UNUSED_ARG (policies); - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); #endif /* TAO_HAS_INTERCEPTORS == 1 */ } @@ -292,11 +291,11 @@ TAO_ORBInitInfo::add_server_request_interceptor_with_policy ( #else ACE_UNUSED_ARG (interceptor); ACE_UNUSED_ARG (policies); - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); #endif /* TAO_HAS_INTERCEPTORS == 1 */ } @@ -317,11 +316,11 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( // is currently not implemented/supported. ACE_UNUSED_ARG (interceptor); ACE_UNUSED_ARG (policies); - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } PortableInterceptor::SlotId @@ -400,8 +399,7 @@ TAO_ORBInitInfo::check_validity (void) // this instance to zero when it is done initializing the ORB, // which is why we base "existence" on the validity of the ORB // core pointer. - throw ( ::CORBA::OBJECT_NOT_EXIST (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO); } } diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 3fc1938dc89..1f1b5b99a1d 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -112,11 +112,11 @@ TAO::ORBInitializer_Registry::register_orb_initializer ( PortableInterceptor::ORBInitializer::_duplicate (init); } else - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } size_t diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 3230ee92e5d..30e4c7ed372 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -93,13 +93,12 @@ TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier // no slots, then the PICurrent_impl object is not created as there is no // data to copy). if (0 == this->slot_count_) - throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); // No need to acquire a lock for this check. At this point, these // attributes are read only. if (identifier >= this->slot_count_) - throw (PortableInterceptor::InvalidSlot ()); + throw PortableInterceptor::InvalidSlot (); } CORBA::ORB_ptr @@ -122,11 +121,11 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc // It MUST be called BEFORE we attempt to get/set any // PICurrent slot data. if (0 != orb_core_.add_tss_cleanup_func (CleanUpPICurrent, this->tss_slot_)) - throw ( ::CORBA::NO_MEMORY ( + throw ::CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, ENOMEM), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); this->slot_count_ = sc; } diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index f32a3b08ba9..a9a60845044 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -38,11 +38,11 @@ TAO_PolicyFactory_Registry::register_policy_factory ( { if (CORBA::is_nil (policy_factory)) { - throw ( ::CORBA::BAD_PARAM ( + throw ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } PortableInterceptor::PolicyFactory_ptr factory = @@ -59,8 +59,8 @@ TAO_PolicyFactory_Registry::register_policy_factory ( if (result == 1) { // PolicyFactory of given type already exists. - throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16, + CORBA::COMPLETED_NO); } else { diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 88efb7bffd9..9ac1c7a4301 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -560,8 +560,7 @@ TAO::ServerRequestInfo::add_reply_service_context ( if (service_context_list.set_context (service_context, replace) == 0) { - throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO); } } diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index bc26578dca1..0d6e5c10549 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -53,12 +53,12 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies if (servant_retention == PortableServer::NON_RETAIN) if (request_processing != PortableServer::USE_SERVANT_MANAGER && request_processing != PortableServer::USE_DEFAULT_SERVANT) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy. if (request_processing == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY) if (servant_retention != PortableServer::RETAIN) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS @@ -86,21 +86,20 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies ); PortableServer::IdAssignmentPolicy_var idap = - PortableServer::IdAssignmentPolicy::_narrow (policy.in () - ); + PortableServer::IdAssignmentPolicy::_narrow (policy.in ()); PortableServer::IdAssignmentPolicyValue id_assignment = idap->value (); // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy. if (request_processing == PortableServer::USE_DEFAULT_SERVANT) if (id_uniqueness != PortableServer::MULTIPLE_ID) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies. if (implicit_activation == PortableServer::IMPLICIT_ACTIVATION) if (servant_retention != PortableServer::RETAIN || id_assignment != PortableServer::SYSTEM_ID) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); #else /* TAO_HAS_MINIMUM_POA == 0 */ ACE_UNUSED_ARG (policies); #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 6587bf06665..cd60ac7b1a2 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -83,7 +83,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, #if ! defined (CORBA_E_MICRO) // An invalid policy was specified. Let the user know about // it. - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); #else ACE_ERROR ((LM_ERROR, "Invalid policy\n")); #endif diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 76674598e53..59351f89c8d 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -148,7 +148,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies } if (!found) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); } } @@ -186,7 +186,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies // || priority > RTCORBA::maxPriority ) { - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); } } else @@ -195,7 +195,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies { if (this->thread_pool_ != 0 && this->thread_pool_->with_lanes ()) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); } policy = @@ -224,14 +224,14 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies { // Checks 0. if (rt_priority_model == TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); RTCORBA::PriorityBands &bands = bands_policy->priority_bands_rep (); // Checks 1. if (bands.length () == 0) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); // Checks 2. for (CORBA::ULong i = 0; i < bands.length (); ++i) @@ -247,7 +247,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies // || bands[i].high > RTCORBA::maxPriority ) { - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); } } @@ -266,7 +266,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies } if (!match) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); } // @@ -303,7 +303,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies match = 1; } if (!match) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); } // Done with checks. @@ -342,7 +342,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies match = 1; } if (!match) - throw (PortableServer::POA::InvalidPolicy ()); + throw PortableServer::POA::InvalidPolicy (); // Done with checks. return; |