diff options
25 files changed, 107 insertions, 119 deletions
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 22933693e3d..0b4aad913f8 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -150,7 +150,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc } else { - throw ( ::CORBA::BAD_TYPECODE ()); + throw ::CORBA::BAD_TYPECODE (); } } diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 4da7b4bbf10..7599e3f49c7 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -188,16 +188,16 @@ TAO_OutputCDR::throw_stub_exception (int error_num ) case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO); ACE_NOTREACHED (break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, - CORBA::COMPLETED_NO)); + throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, + CORBA::COMPLETED_NO); ACE_NOTREACHED (break); #endif case EACCES : // wchar but no codeset - throw ( ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); + throw ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); ACE_NOTREACHED (break); default : throw ::CORBA::MARSHAL (); @@ -213,23 +213,23 @@ TAO_OutputCDR::throw_skel_exception (int error_num ) break; case EINVAL : // wchar from a GIOP 1.0 - throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES)); + throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES); ACE_NOTREACHED (break); case EACCES : // wchar but no codeset - throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 23, - CORBA::COMPLETED_YES)); + throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 23, + CORBA::COMPLETED_YES); ACE_NOTREACHED (break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, - CORBA::COMPLETED_YES)); + throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, + CORBA::COMPLETED_YES); ACE_NOTREACHED (break); #endif default : - throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES); } } @@ -280,18 +280,18 @@ TAO_InputCDR::throw_stub_exception (int error_num ) case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES)); + throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES); ACE_NOTREACHED(break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); + throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES); ACE_NOTREACHED(break); #endif case EACCES : // wchar but no codeset - throw ( ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); + throw ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES); ACE_NOTREACHED(break); default : - throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES); } } @@ -303,16 +303,16 @@ TAO_InputCDR::throw_skel_exception (int error_num ) case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - throw ( ::CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO); ACE_NOTREACHED(break); case EACCES : // wchar but no codeset - throw ( ::CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO); ACE_NOTREACHED(break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - throw ( ::CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); + throw ::CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO); ACE_NOTREACHED(break); #endif diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 26079de0343..5bc19c97e5c 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -352,10 +352,10 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("cannot determine hostname.\n"))); - throw ( ::CORBA::INV_OBJREF + throw ::CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code (TAO::VMCID, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else { diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index f5752180e27..e1913041383 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -355,7 +355,7 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding ( if (this->major_ == 1 && this->minor_ == 0 && typecode->equivalent (CORBA::_tc_wstring)) - throw (IOP::Codec::InvalidTypeForEncoding ()); + throw IOP::Codec::InvalidTypeForEncoding (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp index c204d67837e..4b84cd53ddd 100644 --- a/TAO/tao/Compression/Compression_Manager.cpp +++ b/TAO/tao/Compression/Compression_Manager.cpp @@ -30,7 +30,7 @@ void CompressionManager::register_factory ( if (compressor_factory->compressor_id () == current) { - throw (::Compression::FactoryAlreadyRegistered ()); + throw ::Compression::FactoryAlreadyRegistered (); } } factories_.length (length + 1); @@ -39,8 +39,7 @@ void CompressionManager::register_factory ( else { // @todo Standardize this minor code - throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, - CORBA::COMPLETED_YES)); + throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, CORBA::COMPLETED_NO); } } @@ -73,7 +72,7 @@ CompressionManager::unregister_factory ( } // todo exception - throw (::Compression::UnknownCompressorId ()); + throw ::Compression::UnknownCompressorId (); } ::Compression::CompressorFactory_ptr @@ -101,7 +100,7 @@ CompressionManager::get_factory ( return ::Compression::CompressorFactory::_duplicate (this->factories_[i]); } - throw (::Compression::UnknownCompressorId ()); + throw ::Compression::UnknownCompressorId (); ACE_NOTREACHED (return ::Compression::CompressorFactory::_nil ()); } diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp index 9a095c8d58c..39c83777f7f 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp @@ -38,7 +38,7 @@ ZlibCompressor::compress ( if (retval != Z_OK) { - throw (::Compression::CompressionException ()); + throw ::Compression::CompressionException (); } else { @@ -63,7 +63,7 @@ ZlibCompressor::decompress ( if (retval != Z_OK) { - throw (::Compression::CompressionException ()); + throw ::Compression::CompressionException (); } else { diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 62f2007f539..88b8d3a65a9 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -230,7 +230,7 @@ TAO_DynAny_i::from_any (const CORBA::Any &any) if (!equiv) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } // @@@ (JP) Spec also says we should check for illegal Any diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index 3a39db4ac4e..1a286428a50 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -277,7 +277,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } } @@ -361,7 +361,7 @@ TAO_DynArray_i::set_elements_as_dyn_any ( } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } } @@ -414,7 +414,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any if (length != arg_length) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } CORBA::TypeCode_var field_tc = @@ -447,7 +447,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index fe17113c1b5..5eb152bd428 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -76,7 +76,7 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } @@ -230,7 +230,7 @@ TAO_DynCommon::insert_string (const char * value if (kind != CORBA::tk_string) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } CORBA::ULong const bound = @@ -324,7 +324,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } } @@ -499,7 +499,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value if (kind != CORBA::tk_value) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } // If the arg is 0 we can't do this kind of type checking, @@ -518,7 +518,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value // here, so if the repo ids don't match, we're hosed. if (ACE_OS::strcmp (value_id, my_id) != 0) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } @@ -1187,7 +1187,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } } @@ -1695,7 +1695,7 @@ TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc) if (!equivalent) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index 8bb2f8886be..aa2e8f27d89 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -219,7 +219,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 5af2826dcfc..02ef4ec50bc 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -366,7 +366,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value) } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } @@ -480,7 +480,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any ( } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } @@ -602,7 +602,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any) } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index f6fd98af762..331e55dc52c 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -361,7 +361,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values) if (!equivalent) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } this->da_members_[i]->destroy (); @@ -468,7 +468,7 @@ TAO_DynStruct_i::set_members_as_dyn_any ( if (!equivalent) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } this->da_members_[i]->destroy (); @@ -567,7 +567,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any) } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 54a0af008d1..d3a01b7299c 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -320,7 +320,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value) if (!equivalent) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } CORBA::Any_var value_any = value->to_any (); @@ -440,7 +440,7 @@ TAO_DynUnion_i::set_to_default_member (void) if (default_index == -1) { // No explicit default case. - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } else { @@ -489,7 +489,7 @@ TAO_DynUnion_i::set_to_no_active_member (void) // possible case label values are used. if (default_index != -1) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } else { @@ -510,7 +510,7 @@ TAO_DynUnion_i::set_to_no_active_member (void) if (member_count == label_count) { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } } @@ -683,7 +683,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any) } else { - throw (DynamicAny::DynAny::TypeMismatch ()); + throw DynamicAny::DynAny::TypeMismatch (); } } diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 5a13e11a0a4..508b0990ec2 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -765,8 +765,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, // Throw an exception if the if (parse_error != 0) - throw ( ::CORBA::MARSHAL (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); request_id = request.request_id (); response_required = request.response_expected (); @@ -949,8 +948,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - throw ( ::CORBA::MARSHAL (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); } // Execute a fake request to find out if the object is there or @@ -985,8 +983,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - throw ( ::CORBA::MARSHAL (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); } CORBA::Object_var forward_to; diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index f022d30f3f8..b9b543dbcf9 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -138,11 +138,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior if (okd == 0 || okd == ior) { // No object key delimiter or no hostname specified. - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } // Length of host string. @@ -172,11 +172,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else { @@ -200,11 +200,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("Host address may be omited only when no port has been specified.\n"))); } - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else if (cp_pos != 0) { @@ -229,11 +229,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_INET_Addr ia; if (ia.string_to_addr (tmp.in ()) == -1) { - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else { @@ -288,11 +288,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("cannot determine hostname"))); // @@ What's the right exception to throw here? - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else this->endpoint_.host_ = CORBA::string_dup (tmp_host); diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 46e3377e367..9054a9624b9 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -82,7 +82,7 @@ TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.bind (object_key, IOR) != 0) - throw (IORTable::AlreadyBound ()); + throw IORTable::AlreadyBound (); } void @@ -99,7 +99,7 @@ TAO_IOR_Table_Impl::unbind (const char * object_key) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.unbind (object_key) != 0) - throw (IORTable::NotFound ()); + throw IORTable::NotFound (); } void diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 616bf0dff47..6a226f7d062 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -410,22 +410,22 @@ namespace TAO effective_target->_stubobj (); if (stubobj == 0) - throw ( ::CORBA::INTERNAL ( + throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, errno), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); // Reset the profile in the stubs stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward); if (stub->next_profile () == 0) - throw ( ::CORBA::TRANSIENT ( + throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, errno), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); return; } diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 111265b0243..3a6981e5a2b 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -89,8 +89,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver // If we get here, we completely failed to find an endpoint selector // that we know how to use, so throw an exception. - throw ( ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); + throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 349f4e52513..d60771f3915 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -99,8 +99,7 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr, CORBA::Request_ptr &, CORBA::Flags) { - throw ( ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); } void @@ -113,8 +112,7 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr, CORBA::Request_ptr &, CORBA::Flags) { - throw ( ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); } CORBA::Request_ptr diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index dc2fa190857..d805a80c5e3 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -32,11 +32,11 @@ namespace TAO TAO_Stub * const stub = this->target_->_stubobj (); if (stub == 0) - throw ( ::CORBA::INTERNAL ( + throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); // The invocation has got to be within the context of the // corresponding ORB's configuration. Otherwise things like diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 27249dfc575..63312b4bfac 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -171,8 +171,7 @@ CORBA::ORB::destroy (void) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - throw ( ::CORBA::OBJECT_NOT_EXIST (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO); } if (TAO_debug_level > 2) @@ -362,51 +361,51 @@ CORBA::ORB::get_service_information ( void CORBA::ORB::create_context_list (CORBA::ContextList_ptr &) { - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } void CORBA::ORB::get_default_context (CORBA::Context_ptr &) { - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } void CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq &) { - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } void CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq &) { - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } void CORBA::ORB::get_next_response (CORBA::Request_ptr &) { - throw ( ::CORBA::NO_IMPLEMENT ( + throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( 0, ENOTSUP), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } CORBA::Boolean @@ -1092,16 +1091,15 @@ CORBA::ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj) { if (id == 0 || ACE_OS::strlen (id) == 0) - throw ( ::CORBA::ORB::InvalidName ()); + throw ::CORBA::ORB::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 ( ::CORBA::ORB::InvalidName ()); + throw ::CORBA::ORB::InvalidName (); } #endif @@ -1130,8 +1128,7 @@ CORBA::ORB::check_shutdown (void) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - throw ( ::CORBA::OBJECT_NOT_EXIST (0, - CORBA::COMPLETED_NO)); + throw ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO); } } diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h index afa933dfdae..6123d76829b 100644 --- a/TAO/tao/ORB_Constants.h +++ b/TAO/tao/ORB_Constants.h @@ -44,13 +44,13 @@ namespace CORBA * @c 2 is done as follows: * * @verbatim - * throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); + * throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); * @endverbatim * * *NOT* as: * * @verbatim - * throw (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO); + * throw ::CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO); * @endverbatim */ const ULong OMGVMCID = 0x4f4d0000U; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 36f3ab53c1b..7eb48c9cce1 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2362,8 +2362,7 @@ TAO_ORB_Core::check_shutdown (void) // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB // has shutdown by the time an ORB function is called. - throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); } } @@ -2449,7 +2448,7 @@ TAO_ORB_Core::resolve_typecodefactory_i (void) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to instantiate ") ACE_TEXT ("a TypeCodeFactory_Loader\n"))); - throw ( ::CORBA::ORB::InvalidName ()); + throw ::CORBA::ORB::InvalidName (); } } diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 09d619e0a0e..b9dcea41191 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -557,11 +557,11 @@ TAO_Profile::verify_orb_configuration (void) // possible to add components to the profile. // @todo: We need the proper minor code as soon as the spec is // updated. - throw ( ::CORBA::BAD_PARAM ( + throw ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } } @@ -588,11 +588,11 @@ TAO_Profile::verify_profile_version (void) // possible to add components to the profile. // @todo: We need the proper minor code as soon as the spec is // updated. - throw ( ::CORBA::BAD_PARAM ( + throw ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } } @@ -623,11 +623,11 @@ TAO_Profile::addressing_mode (CORBA::Short addr break; default: - throw ( ::CORBA::BAD_PARAM ( + throw ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } } @@ -637,11 +637,11 @@ TAO_Profile::parse_string (const char *ior { if (!ior || !*ior) { - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } // Remove the "N.n@" version prefix, if it exists, and verify the @@ -669,15 +669,14 @@ TAO_Profile::parse_string (const char *ior if (this->version_.major != TAO_DEF_GIOP_MAJOR || this->version_.minor > TAO_DEF_GIOP_MINOR) { - throw ( ::CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } - this->parse_string_i (ior - ); + this->parse_string_i (ior); } CORBA::Boolean diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 3b8d01d597f..bc81f383513 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -102,11 +102,11 @@ namespace TAO // Initialize the messaging object if (this->transport_->messaging_init (version.major, version.minor) == -1) { - throw ( ::CORBA::INTERNAL ( + throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( 0, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } if (!this->transport_->is_tcs_set ()) |