diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-29 19:18:13 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-29 19:18:13 +0000 |
| commit | cd080eec9c415b6a118394ce352f43b1a99a5ea5 (patch) | |
| tree | 5ebd0390906c1422767d746e55d40a7742c18a88 | |
| parent | 0172e8e44bc1eeb4458e080a72decc25a7a48dc6 (diff) | |
| download | ATCD-cd080eec9c415b6a118394ce352f43b1a99a5ea5.tar.gz | |
Mon Jan 29 19:11:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>
181 files changed, 824 insertions, 1223 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 49a38e31e12..aa64c85df66 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,188 @@ +Mon Jan 29 19:11:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Adapter_Registry.cpp: + * tao/AnyTypeCode/Any.cpp: + * tao/AnyTypeCode/Any_Array_Impl_T.cpp: + * tao/AnyTypeCode/Any_Basic_Impl.cpp: + * tao/AnyTypeCode/Any_Basic_Impl_T.cpp: + * tao/AnyTypeCode/Any_Dual_Impl_T.cpp: + * tao/AnyTypeCode/Any_Impl_T.cpp: + * tao/AnyTypeCode/Any_Special_Impl_T.cpp: + * tao/AnyTypeCode/Any_SystemException.cpp: + * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp: + * tao/AnyTypeCode/Empty_Param_TypeCode.cpp: + * tao/AnyTypeCode/ExceptionA.cpp: + * tao/AnyTypeCode/PolicyA.cpp: + * tao/AnyTypeCode/TypeCode.cpp: + * tao/AnyTypeCode/WrongTransactionA.cpp: + * tao/BiDir_GIOP/BiDirGIOP.cpp: + * tao/Codeset/Codeset_Manager_Factory.cpp: + * tao/Codeset/Codeset_Translator_Factory.cpp: + * tao/Collocated_Invocation.cpp: + * tao/CORBANAME_Parser.cpp: + * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp: + * tao/CSD_Framework/CSD_Strategy_Base.cpp: + * tao/CSD_Framework/CSD_Strategy_Base.inl + * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl + * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp: + * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp: + * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp: + * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp: + * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl + * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp: + * tao/CSD_ThreadPool/CSD_TP_Request.inl + * tao/CSD_ThreadPool/CSD_TP_Task.cpp: + * tao/DynamicInterface/DII_Arguments.cpp: + * tao/DynamicInterface/DII_Reply_Dispatcher.cpp: + * tao/DynamicInterface/Dynamic_Implementation.cpp: + * tao/EndpointPolicy/EndpointPolicy.cpp: + * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp: + * tao/FILE_Parser.cpp: + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Base.h: + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Message_Lite.h: + * tao/HTTP_Parser.cpp: + * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp: + * tao/IIOP_Acceptor.cpp: + * tao/IIOP_Connection_Handler.cpp: + * tao/ImR_Client/ImR_Client.cpp: + * tao/Invocation_Adapter.cpp: + * tao/Invocation_Base.cpp: + * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp: + * tao/IORInterceptor_Adapter.h: + * tao/IORTable/IOR_Table_Impl.cpp: + * tao/IORTable/IOR_Table_Impl.h: + * tao/IORTable/Table_Adapter.cpp: + * tao/Leader_Follower_Flushing_Strategy.cpp: + * tao/LF_Connect_Strategy.cpp: + * tao/LF_Connect_Strategy.h: + * tao/LF_Event.cpp: + * tao/LF_Event.h: + * tao/LF_Event_Binder.h: + * tao/LF_Follower_Auto_Adder.h: + * tao/LF_Strategy_Complete.h: + * tao/LocateRequest_Invocation.cpp: + * tao/LocateRequest_Invocation_Adapter.cpp: + * tao/Messaging/Asynch_Reply_Dispatcher.cpp: + * tao/Messaging/Connection_Timeout_Policy_i.cpp: + * tao/Messaging/Messaging_Loader.cpp: + * tao/Messaging/Messaging_ORBInitializer.cpp: + * tao/Messaging/Messaging_Policy_i.cpp: + * tao/MProfile.cpp: + * tao/Muxed_TMS.cpp: + * tao/Null_Fragmentation_Strategy.cpp: + * tao/Null_Fragmentation_Strategy.h: + * tao/NVList_Adapter.h: + * tao/Object.cpp: + * tao/Object.h: + * tao/Object_T.cpp: + * tao/ObjectKey_Table.cpp: + * tao/ObjectKey_Table.h: + * tao/Objref_VarOut_T.h: + * tao/operation_details.cpp: + * tao/ORB.cpp: + * tao/ORB_Core.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.inl + * tao/ORBInitializer_Registry.cpp: + * tao/ORBInitializer_Registry.h: + * tao/ORBInitializer_Registry_Adapter.h: + * tao/Parser_Registry.cpp: + * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp: + * tao/PI/ORBInitializer_Registry_Impl.cpp: + * tao/PI/PI.cpp: + * tao/PI/PI_ORBInitializer.cpp: + * tao/PI_Server/PI_Server_Loader.cpp: + * tao/PI_Server/PortableServer_ORBInitializer.cpp: + * tao/PI_Server/ServerInterceptorAdapter.cpp: + * tao/PI_Server/ServerInterceptorAdapter.h: + * tao/Pluggable_Messaging.h: + * tao/Pluggable_Messaging_Utils.inl + * tao/Policy_Current_Impl.cpp: + * tao/Policy_Current_Impl.h: + * tao/Policy_Current_Impl.inl + * tao/Policy_Manager.cpp: + * tao/Policy_Manager.h: + * tao/Policy_Manager.inl + * tao/Policy_Set.cpp: + * tao/Policy_Set.h: + * tao/Policy_Validator.cpp: + * tao/Policy_Validator.h: + * tao/PolicyFactory_Registry_Adapter.h: + * tao/PortableServer/Adapter_Activator.cpp: + * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp: + * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp: + * tao/PortableServer/Local_Servant_Base.cpp: + * tao/PortableServer/Local_Servant_Base.h: + * tao/PortableServer/Non_Servant_Upcall.cpp: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp: + * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp: + * tao/PortableServer/Root_POA.cpp: + * tao/PortableServer/Servant_Base.cpp: + * tao/PortableServer/Servant_Upcall.cpp: + * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * tao/PortableServer/Upcall_Wrapper.cpp: + * tao/Profile.cpp: + * tao/Reactive_Connect_Strategy.cpp: + * tao/Reactive_Flushing_Strategy.cpp: + * tao/Remote_Invocation.cpp: + * tao/Remote_Invocation.h: + * tao/RTCORBA/RT_Current.h: + * tao/RTCORBA/RT_Endpoint_Utils.cpp: + * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp: + * tao/RTCORBA/RT_ORB.cpp: + * tao/RTCORBA/RT_ORB.h: + * tao/RTCORBA/RT_ORB_Loader.cpp: + * tao/RTCORBA/RT_ORB_Loader.h: + * tao/RTCORBA/RT_ORBInitializer.cpp: + * tao/RTCORBA/RT_ORBInitializer.h: + * tao/RTCORBA/RT_Policy_i.cpp: + * tao/RTCORBA/RT_Policy_i.h: + * tao/RTCORBA/RT_Protocols_Hooks.cpp: + * tao/RTCORBA/RT_Stub.h: + * tao/RTCORBA/RT_Stub_Factory.h: + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp: + * tao/RTCORBA/Thread_Pool.cpp: + * tao/RTCORBA/Thread_Pool.h: + * tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + * tao/RTScheduling/Current.cpp: + * tao/RTScheduling/Request_Interceptor.cpp: + * tao/RTScheduling/RTScheduler_Loader.cpp: + * tao/Service_Callbacks.cpp: + * tao/Service_Context.h: + * tao/Strategies/advanced_resource.h: + * tao/Strategies/COIOP_Transport.cpp: + * tao/Strategies/DIOP_Acceptor.cpp: + * tao/Strategies/DIOP_Connection_Handler.cpp: + * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp: + * tao/Strategies/SCIOP_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Acceptor.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Factory.cpp: + * tao/Strategies/UIOP_Lite_Factory.cpp: + * tao/Stub.cpp: + * tao/Synch_Invocation.h: + * tao/TAO_Server_Request.cpp: + * tao/TAO_Server_Request.h: + * tao/Transport_Queueing_Strategies.cpp: + * tao/TransportCurrent/Current_Impl.cpp: + * tao/TransportCurrent/Current_Loader.cpp: + * tao/TransportCurrent/Current_ORBInitializer.cpp: + * tao/TransportCurrent/Current_ORBInitializer_Base.cpp: + * tao/Utils/ORB_Manager.cpp: + * tao/Utils/Servant_Var.inl + * tao/Utils/Server_Main.cpp: + * tao/Valuetype/AbstractBase_T.cpp: + * tao/Wait_On_LF_No_Upcall.cpp: + * tao/Wait_Strategy.h: + Layout changes, const improvements and some cleanup of old code + that is not needed anymore now we removed emulated exceptions + Sun Jan 28 19:59:14 2007 William R. Otte <wotte@dre.vanderbilt.edu> * TAO version 1.5.6 released. diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index 34fb70d6e0e..bfdf7fc5280 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -44,7 +44,7 @@ TAO_Adapter_Registry::close (int wait_for_completion) this->adapters_[i]->close (wait_for_completion); } } - catch (::CORBA::Exception&ex) + catch (const::CORBA::Exception&ex) { if (TAO_debug_level > 3) { diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 0b4aad913f8..6d4fe106f35 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -287,7 +287,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) impl->_tao_decode (cdr ); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 4a8c57146cf..7816b59ed9d 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -121,7 +121,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index 35e375ce4df..3c251f5f23a 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -160,7 +160,7 @@ namespace TAO // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index ca85a402171..75905a1bdb1 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -106,7 +106,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 4fe6c209652..a94984c507c 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -162,7 +162,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index b42955f5e91..4595132c653 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -117,7 +117,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (any_tc); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index e901e61fe3f..7eec333b18d 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -160,7 +160,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, // Duplicated by Any_Impl base class constructor. ::CORBA::release (tc); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 820e411234e..ee0c4633a72 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -145,7 +145,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, return true; } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } @@ -178,7 +178,7 @@ TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr) this->value_->_tao_encode (cdr); return true; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } return false; @@ -192,7 +192,7 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr) this->value_->_tao_decode (cdr); return true; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } return false; diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index fbf786b3232..552a18f762c 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -35,7 +35,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type ( { this->_tao_decode (cdr); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } } @@ -71,7 +71,7 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) return false; } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } @@ -190,7 +190,7 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const return for_reading >> obj; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } @@ -234,7 +234,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter(); return adapter->stream_to_value (this->cdr_, val); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } @@ -278,7 +278,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter(); return adapter->stream_to_abstract_base (this->cdr_, obj); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 4660b359253..85ef4a595f1 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -15,8 +15,7 @@ ACE_RCSID (AnyTypeCode, TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool -TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, - CORBA::ULong) const +TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const { // Empty parameter list. Nothing to marshal. @@ -40,8 +39,7 @@ TAO::TypeCode::Empty_Param::tao_release (void) } CORBA::Boolean -TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr - ) const +TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr) const { // Equality has already been established in the // CORBA::TypeCode base class. @@ -50,8 +48,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr } CORBA::Boolean -TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc - ) const +TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const { // We could refactor this code to the CORBA::TypeCode::equivalent() // method but doing so would force us to determine the unaliased @@ -59,9 +56,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc // of this TypeCode, choose to optimize away the additional kind // unaliasing operation rather than save space. - CORBA::TCKind const tc_kind = - TAO::unaliased_kind (tc - ); + CORBA::TCKind const tc_kind = TAO::unaliased_kind (tc); if (tc_kind != this->kind_) return false; @@ -70,8 +65,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc } CORBA::TypeCode_ptr -TAO::TypeCode::Empty_Param::get_compact_typecode_i ( - void) const +TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const { // Already compact since parameter list is empty. diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index 1b1f7645411..c265e25d28c 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -45,7 +45,7 @@ namespace TAO return true; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } @@ -63,7 +63,7 @@ namespace TAO return true; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 9b177c88bca..8e157d6aeba 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -196,7 +196,7 @@ namespace TAO { this->value_->_tao_decode (cdr); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } @@ -282,7 +282,7 @@ namespace TAO { this->value_->_tao_decode (cdr); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index b2b4f0d92ec..af3ba6357a4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -66,7 +66,7 @@ CORBA::TypeCode::equal (TypeCode_ptr tc if (ACE_OS::strcmp (this_name, tc_name) != 0) return 0; } - catch ( ::CORBA::TypeCode::BadKind&) + catch (const ::CORBA::TypeCode::BadKind&) { // Some TypeCodes do not support the id() and name() // operations. Ignore the failure, and continue equality @@ -133,7 +133,7 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc return false; } } - catch ( ::CORBA::TypeCode::BadKind&) + catch (const ::CORBA::TypeCode::BadKind&) { // Some TypeCodes do not support the id() operation. Ignore the // failure, and continue equivalence verification using TypeCode diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 0fb04dbc451..1eb4a217261 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -82,7 +82,7 @@ namespace TAO { this->value_->_tao_decode (cdr); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index 8b2da6f3919..c5767f6cd40 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -51,7 +51,7 @@ TAO_BiDirGIOP_Loader::init (int, TAO_BiDirGIOP_Loader::is_activated_ = true; } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 691903ae19a..16ef2275d05 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -137,7 +137,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, obj = name_context._retn (); } } - catch ( ::CORBA::SystemException& ex) + catch (const ::CORBA::SystemException& ex) { if (TAO_debug_level >= 4) { diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index b569936fffc..27b95c88f2d 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -81,7 +81,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch servant->_dispatch(*this->request_, 0); } // Only CORBA exceptions are caught here. - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (this->request_->collocated()) { diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp index 2e0a1bbc2e3..4fe82909d95 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp @@ -84,7 +84,7 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa poa_impl->set_csd_strategy (this); strategy_set = true; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl index d3b40bfcef9..b68910e87ab 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl @@ -16,8 +16,7 @@ ACE_INLINE void TAO::CSD::Strategy_Base::dispatch_request (TAO_ServerRequest& server_request, - TAO::Portable_Server::Servant_Upcall& upcall - ) + TAO::Portable_Server::Servant_Upcall& upcall) { DispatchResult result; @@ -27,8 +26,7 @@ TAO::CSD::Strategy_Base::dispatch_request upcall.user_id(), this->poa_.in(), server_request.operation(), - upcall.servant() - ); + upcall.servant()); } else { @@ -36,8 +34,7 @@ TAO::CSD::Strategy_Base::dispatch_request upcall.user_id(), this->poa_.in(), server_request.operation(), - upcall.servant() - ); + upcall.servant()); } switch (result) @@ -69,9 +66,7 @@ TAO::CSD::Strategy_Base::dispatch_request case DISPATCH_DEFERRED: // Perform the "default" dispatching strategy logic for this request // right now, using the current thread. - upcall.servant()->_dispatch(server_request, - (void*)&upcall - ); + upcall.servant()->_dispatch(server_request, (void*)&upcall); break; default: @@ -120,8 +115,7 @@ ACE_INLINE void TAO::CSD::Strategy_Base::servant_activated_event (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ) + const PortableServer::ObjectId& oid) { this->servant_activated_event_i(servant, oid); } @@ -130,8 +124,7 @@ ACE_INLINE void TAO::CSD::Strategy_Base::servant_deactivated_event (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ) + const PortableServer::ObjectId& oid) { this->servant_deactivated_event_i(servant, oid); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl index 3cc1e6c5a38..57854bd9aa8 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl @@ -14,17 +14,7 @@ ACE_INLINE TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant) : servant_(servant) { - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception - // then this constructor needs deal with the exception. - try - { - this->servant_->_add_ref (); - } - catch (...) - { - } + this->servant_->_add_ref (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp index 929eef12517..ff94e678bb3 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp @@ -32,7 +32,7 @@ TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i() { this->do_dispatch(); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp index 4afb762975f..aff5665bd2b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp @@ -26,7 +26,7 @@ TAO::CSD::TP_Collocated_Synch_Request::dispatch_i() { this->do_dispatch(); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // We need to save off a copy of the exception. this->exception_ = ex._tao_duplicate(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp index 64d74dd7e53..1da58c328c0 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp @@ -44,7 +44,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i() { this->do_dispatch(); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp index 56637eeb6ac..603f8eae77a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp @@ -24,7 +24,7 @@ TAO::CSD::TP_Custom_Asynch_Request::dispatch_i() { this->execute_op(); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl index 52bca678d8c..7c266f21c6b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl @@ -9,23 +9,13 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation (PortableServer::Servant servant) : servant_ (servant) { - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception - // then this constructor needs deal with the exception. - try - { - this->servant_->_add_ref (); - } - catch (...) - { - } + this->servant_->_add_ref (); } ACE_INLINE void -TAO::CSD::TP_Custom_Request_Operation::execute() +TAO::CSD::TP_Custom_Request_Operation::execute (void) { this->execute_i(); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp index 44d405d7fc3..036a804beac 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp @@ -31,7 +31,7 @@ TAO::CSD::TP_Remote_Request::dispatch_i() { this->do_dispatch(); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Eat these. We probably should log these, but since we have already // unblocked the requesting thread there is no point in saving it or diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl index 0d7335ae9a0..2661a54453c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl @@ -12,17 +12,7 @@ TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant, servant_ (servant), servant_state_(servant_state, false) { - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception - // then this constructor needs deal with the exception. - try - { - this->servant_->_add_ref (); - } - catch (...) - { - } + this->servant_->_add_ref (); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index b38514d6ce7..010e0ed9132 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -299,8 +299,7 @@ TAO::CSD::TP_Task::close(u_long flag) void -TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant - ) +TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant) { GuardType guard(this->lock_); diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index 7f89626dc47..fc476c15e4c 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -19,19 +19,19 @@ ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory () +TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void) { } bool -TAO_Codeset_Manager_Factory::is_default() const +TAO_Codeset_Manager_Factory::is_default (void) const { return false; } TAO_Codeset_Manager * -TAO_Codeset_Manager_Factory::create () +TAO_Codeset_Manager_Factory::create (void) { TAO_Codeset_Manager_i *csm = 0; ACE_NEW_RETURN (csm, TAO_Codeset_Manager_i, 0); diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp index bd3a915c51d..44112ee49c9 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp @@ -45,8 +45,7 @@ TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **) void TAO_Codeset_Translator_Factory::assign_i ( TAO_InputCDR *cdr, - ACE_Char_Codeset_Translator *trans - ) const + ACE_Char_Codeset_Translator *trans) const { cdr->char_translator(trans); } @@ -54,8 +53,7 @@ TAO_Codeset_Translator_Factory::assign_i ( void TAO_Codeset_Translator_Factory::assign_i ( TAO_OutputCDR *cdr, - ACE_Char_Codeset_Translator *trans - ) const + ACE_Char_Codeset_Translator *trans) const { cdr->char_translator(trans); } @@ -63,8 +61,7 @@ TAO_Codeset_Translator_Factory::assign_i ( void TAO_Codeset_Translator_Factory::assign_i ( TAO_InputCDR *cdr, - ACE_WChar_Codeset_Translator *trans - ) const + ACE_WChar_Codeset_Translator *trans) const { cdr->wchar_translator(trans); } @@ -72,8 +69,7 @@ TAO_Codeset_Translator_Factory::assign_i ( void TAO_Codeset_Translator_Factory::assign_i ( TAO_OutputCDR *cdr, - ACE_WChar_Codeset_Translator *trans - ) const + ACE_WChar_Codeset_Translator *trans) const { cdr->wchar_translator(trans); } diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp index ee4d5e23f80..0f3e029859f 100644 --- a/TAO/tao/Collocated_Invocation.cpp +++ b/TAO/tao/Collocated_Invocation.cpp @@ -35,8 +35,7 @@ namespace TAO Invocation_Status Collocated_Invocation::invoke (Collocation_Proxy_Broker *cpb, - Collocation_Strategy strat - ) + Collocation_Strategy strat) { Invocation_Status s = TAO_INVOKE_FAILURE; @@ -74,8 +73,7 @@ namespace TAO dispatcher->dispatch (orb_core, request, - this->forwarded_to_.out () - ); + this->forwarded_to_.out ()); } else { @@ -85,8 +83,7 @@ namespace TAO this->details_.args_num (), this->details_.opname (), this->details_.opname_len (), - strat - ); + strat); } // Invocation completed succesfully @@ -99,16 +96,14 @@ namespace TAO if (this->forwarded_to_.in ()) this->reply_received (TAO_INVOKE_RESTART); - s = - this->receive_other_interception (); + s = this->receive_other_interception (); } // NOTE: Any other condition that needs handling? else if (this->response_expected ()) { this->reply_received (TAO_INVOKE_SUCCESS); - s = - this->receive_reply_interception (); + s = this->receive_reply_interception (); } if (s != TAO_INVOKE_SUCCESS) return s; diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index 3ecfa63d85b..fc433181a84 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -32,7 +32,7 @@ namespace TAO ); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } @@ -59,7 +59,7 @@ namespace TAO CORBA::ARG_IN | CORBA::ARG_INOUT ); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } @@ -85,7 +85,7 @@ namespace TAO this->lazy_evaluation_ ); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return false; } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 769a3bd5090..fe5965ab095 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -86,7 +86,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( this->reply_status_ ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { @@ -122,7 +122,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index be9247638db..18301ed505d 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -169,7 +169,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, dsi_request->dsi_marshal (); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // Only if the client is waiting. if (request.response_expected () && !request.sync_with_server ()) diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp index 6552490eaa7..c65338b9971 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp @@ -38,7 +38,7 @@ TAO_EndpointPolicy_Initializer::init (void) PortableInterceptor::register_orb_initializer (orb_initializer.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp index 41acbc30ea9..95f7ec19b8f 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp @@ -59,7 +59,7 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories ( policy_factory.in () ); } - catch ( ::CORBA::BAD_INV_ORDER& ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -71,7 +71,7 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories ( } throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... throw; diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 479f06a2d5c..6f9db22679c 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -65,7 +65,7 @@ TAO_FILE_Parser::parse_string (const char *ior, reader.alloc ()->free (string); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { reader.alloc ()->free (string); throw; diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index b7a0952feac..01e06b447f7 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -212,7 +212,7 @@ TAO_GIOP_Message_Base::generate_reply_header ( return -1; } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 4) ex._tao_print_exception ( @@ -861,8 +861,7 @@ int TAO_GIOP_Message_Base::generate_exception_reply ( TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params_Base ¶ms, - CORBA::Exception &x - ) + const CORBA::Exception &x) { // A new try/catch block, but if something goes wrong now we have no // hope, just abort. @@ -870,12 +869,10 @@ TAO_GIOP_Message_Base::generate_exception_reply ( try { // Make the GIOP & reply header. - this->generate_reply_header (cdr, - params); - x._tao_encode (cdr - ); + this->generate_reply_header (cdr, params); + x._tao_encode (cdr); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Now we know that while handling the error an other error // happened -> no hope, close connection. @@ -1250,7 +1247,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index f8c2452f0f7..f991225fdc9 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -132,8 +132,7 @@ public: virtual int generate_exception_reply ( TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params_Base ¶ms, - CORBA::Exception &x - ); + const CORBA::Exception &x); /// Header length virtual size_t header_length (void) const; diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 12e666c5f2d..baadd95a181 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -676,8 +676,7 @@ int TAO_GIOP_Message_Lite::generate_exception_reply ( TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params_Base ¶ms, - CORBA::Exception &x - ) + const CORBA::Exception &x) { // A new try/catch block, but if something goes wrong now we have no // hope, just abort. @@ -689,7 +688,7 @@ TAO_GIOP_Message_Lite::generate_exception_reply ( params); x._tao_encode (cdr); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Now we know that while handling the error an other error // happened -> no hope, close connection. @@ -1029,7 +1028,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; @@ -1485,7 +1484,7 @@ TAO_GIOP_Message_Lite::send_reply_exception ( x->_tao_encode (output); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Now we know that while handling the error an other error // happened -> no hope, close connection. diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 22807573742..df7fd9c33f9 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -141,7 +141,7 @@ public: virtual int generate_exception_reply ( TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params_Base ¶ms, - CORBA::Exception &x + const CORBA::Exception &x ); /// Consolidate fragmented message with associated fragments, being diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp index 68a127359cb..3453287349e 100644 --- a/TAO/tao/HTTP_Parser.cpp +++ b/TAO/tao/HTTP_Parser.cpp @@ -123,7 +123,7 @@ TAO_HTTP_Parser::parse_string (const char *ior, { object = orb->string_to_object (string.c_str()); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 2463bc1bc80..4ef9c8103ff 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -130,11 +130,11 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote ( { _tao_call.invoke (0, 0); } - catch ( ::CORBA::OBJECT_NOT_EXIST&) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { return CORBA::InterfaceDef::_nil (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 30758b60b00..722e511e226 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -91,13 +91,9 @@ TAO_IIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key, // if they should be spread across multiple profiles. if (priority == TAO_INVALID_PRIORITY && this->orb_core_->orb_params ()->shared_profile () == 0) - return this->create_new_profile (object_key, - mprofile, - priority); + return this->create_new_profile (object_key, mprofile, priority); else - return this->create_shared_profile (object_key, - mprofile, - priority); + return this->create_shared_profile (object_key, mprofile, priority); } int diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 01f0e6043e3..8dd55a7767b 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -121,7 +121,7 @@ TAO_IIOP_Connection_Handler::open (void*) tph->server_protocol_properties_at_orb_level (protocol_properties); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return -1; } diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 8d175bb9826..e09b1b72eaf 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -84,7 +84,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( info.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // According to the Portable Interceptors specification, // IORInterceptor::establish_components() must not throw an @@ -153,7 +153,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established ( ); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, CORBA::COMPLETED_NO); diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index 752aff0b006..91e5ab57b63 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -64,19 +64,13 @@ public: virtual ~TAO_IORInterceptor_Adapter (void); virtual void add_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor - - ) = 0; + PortableInterceptor::IORInterceptor_ptr interceptor) = 0; virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - - ) = 0; - - virtual void destroy_interceptors ( + const CORBA::PolicyList& policies) = 0; - ) = 0; + virtual void destroy_interceptors (void) = 0; /// Call the IORInterceptor::establish_components() method on all /// registered IORInterceptors. @@ -91,20 +85,17 @@ public: /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. - virtual void components_established (PortableInterceptor::IORInfo_ptr info - ) + virtual void components_established (PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state - ) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 9054a9624b9..1bf0d21c4fb 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -18,10 +18,9 @@ ACE_RCSID (IORTable, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IOR_Table_Impl_ptr -TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate ( - TAO_IOR_Table_Impl_ptr p) +TAO::Objref_Traits <TAO_IOR_Table_Impl>::duplicate (TAO_IOR_Table_Impl_ptr p) { - if (! ::CORBA::is_nil (p)) + if (!::CORBA::is_nil (p)) { p->_add_ref (); } @@ -30,22 +29,20 @@ TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate ( } void -TAO::Objref_Traits<TAO_IOR_Table_Impl>::release ( - TAO_IOR_Table_Impl_ptr p) +TAO::Objref_Traits <TAO_IOR_Table_Impl>::release (TAO_IOR_Table_Impl_ptr p) { ::CORBA::release (p); } TAO_IOR_Table_Impl_ptr -TAO::Objref_Traits<TAO_IOR_Table_Impl>::nil (void) +TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil (void) { return TAO_IOR_Table_Impl::_nil (); } ::CORBA::Boolean -TAO::Objref_Traits<TAO_IOR_Table_Impl>::marshal ( - const TAO_IOR_Table_Impl_ptr, - TAO_OutputCDR &) +TAO::Objref_Traits <TAO_IOR_Table_Impl>::marshal (const TAO_IOR_Table_Impl_ptr, + TAO_OutputCDR &) { return false; } diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index e6feaf6ea01..e04d59d55dd 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -37,60 +37,51 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IOR_Table_Impl; typedef TAO_IOR_Table_Impl *TAO_IOR_Table_Impl_ptr; -typedef TAO_Objref_Var_T<TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var; -typedef TAO_Objref_Out_T<TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out; +typedef TAO_Objref_Var_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var; +typedef TAO_Objref_Out_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out; class TAO_IOR_Table_Impl : public virtual IORTable::Table, public virtual TAO_Local_RefCounted_Object { public: - static TAO_IOR_Table_Impl_ptr _nil (void) - { - return static_cast<TAO_IOR_Table_Impl_ptr> (0); - } + static TAO_IOR_Table_Impl_ptr + _nil (void) + { + return static_cast<TAO_IOR_Table_Impl_ptr> (0); + } /// Constructor 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 - )); - - /** - * @name The IORTable::Table methods - * - * 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 rebind (const char * object_key, const char * IOR) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void unbind (const char * object_key) - ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::NotFound - )); - - virtual void set_locator (IORTable::Locator_ptr the_locator) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - //@} + ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); + + /** + * @name The IORTable::Table methods + * + * 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 rebind (const char * object_key, const char * IOR) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void unbind (const char * object_key) + ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); + + virtual void set_locator (IORTable::Locator_ptr the_locator) + ACE_THROW_SPEC ((CORBA::SystemException)); + //@} private: - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> Map; + typedef ACE_Hash_Map_Manager_Ex <ACE_CString, ACE_CString, + ACE_Hash <ACE_CString>, + ACE_Equal_To <ACE_CString>, + ACE_Null_Mutex> Map; /// The map Map map_; @@ -106,23 +97,19 @@ private: namespace TAO { template<> - struct TAO_IORTable_Export Objref_Traits< TAO_IOR_Table_Impl> + struct TAO_IORTable_Export + Objref_Traits <TAO_IOR_Table_Impl> { - static TAO_IOR_Table_Impl_ptr duplicate ( - TAO_IOR_Table_Impl_ptr - ); + static TAO_IOR_Table_Impl_ptr duplicate (TAO_IOR_Table_Impl_ptr); - static void release ( - TAO_IOR_Table_Impl_ptr - ); + static void release (TAO_IOR_Table_Impl_ptr); static TAO_IOR_Table_Impl_ptr nil (void); - static ::CORBA::Boolean marshal ( - const TAO_IOR_Table_Impl_ptr p, - TAO_OutputCDR & cdr - ); - }; + static ::CORBA::Boolean marshal (const TAO_IOR_Table_Impl_ptr p, + TAO_OutputCDR &cdr); + } + ; } diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index 4b46f57d614..0fb63c1df41 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -171,7 +171,7 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *stub) { found = this->find_object (key, forward_to.out ()); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } @@ -199,7 +199,7 @@ TAO_Table_Adapter::find_object (TAO::ObjectKey &key, CORBA::String_var ior = root_->find (object_key.in ()); forward_to = this->orb_core_.orb ()->string_to_object (ior.in ()); } - catch ( ::IORTable::NotFound&) + catch (const ::IORTable::NotFound&) { return 0; } diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 175e0b6a867..0ac87661ffd 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -131,11 +131,11 @@ namespace TAO svr.in() ); } - catch ( ::CORBA::SystemException&) + catch (const ::CORBA::SystemException&) { throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), @@ -176,7 +176,7 @@ namespace TAO imr_locator->server_is_shutting_down (poa->name().c_str () ); } - catch ( ::CORBA::COMM_FAILURE&) + catch (const ::CORBA::COMM_FAILURE&) { // At the moment we call this during ORB shutdown and the ORB is // configured to drop replies during shutdown (it does by default in @@ -184,13 +184,13 @@ namespace TAO if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, "Ignoring COMM_FAILURE while unregistering from ImR.\n")); } - catch ( ::CORBA::TRANSIENT&) + catch (const ::CORBA::TRANSIENT&) { // Similarly, there are cases where we could get a TRANSIENT. if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, "Ignoring TRANSIENT while unregistering from ImR.\n")); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ( "ImR_Client_Adapter_Impl::imr_notify_shutdown()"); diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 6a226f7d062..5cd48381edb 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -35,12 +35,10 @@ namespace TAO void Invocation_Adapter::invoke (TAO::Exception_Data *ex_data, - unsigned long ex_count - ) + unsigned long ex_count) { // Should stub object be refcounted here? - TAO_Stub *stub = - this->get_stub (); + TAO_Stub *stub = this->get_stub (); TAO_Operation_Details op_details (this->operation_, this->op_len_, @@ -50,15 +48,12 @@ namespace TAO ex_count, this->is_dii_request_); - this->invoke_i (stub, - op_details - ); + this->invoke_i (stub, op_details); } void Invocation_Adapter::invoke_i (TAO_Stub *stub, - TAO_Operation_Details &details - ) + TAO_Operation_Details &details) { // The invocation has got to be within the context of the // corresponding ORB's configuration. Otherwise things like @@ -87,8 +82,7 @@ namespace TAO if (cpb_ != 0 || effective_target->_servant () != 0) { strat = - TAO_ORB_Core::collocation_strategy (effective_target.in () - ); + TAO_ORB_Core::collocation_strategy (effective_target.in ()); } if (strat == TAO_CS_REMOTE_STRATEGY || @@ -99,23 +93,20 @@ namespace TAO this->invoke_remote_i (stub, details, effective_target, - max_wait_time - ); + max_wait_time); } else { if (strat == TAO_CS_THRU_POA_STRATEGY) { - (void) this->set_response_flags (stub, - details); + (void) this->set_response_flags (stub, details); } status = this->invoke_collocated_i (stub, details, effective_target, - strat - ); + strat); } if (status == TAO_INVOKE_RESTART) @@ -166,8 +157,7 @@ namespace TAO Invocation_Adapter::invoke_collocated_i (TAO_Stub *stub, TAO_Operation_Details &details, CORBA::Object_var &effective_target, - Collocation_Strategy strat - ) + Collocation_Strategy strat) { // To make a collocated call we must have a collocated proxy broker, the // invoke_i() will make sure that we only come here when we have one @@ -184,10 +174,7 @@ namespace TAO details, this->type_ == TAO_TWOWAY_INVOCATION); - status = - coll_inv.invoke (this->cpb_, - strat - ); + status = coll_inv.invoke (this->cpb_, strat); if (status == TAO_INVOKE_RESTART && coll_inv.is_forwarded ()) @@ -204,8 +191,7 @@ namespace TAO (void) this->object_forwarded (effective_target, stub, - is_permanent_forward - ); + is_permanent_forward); } return status; @@ -251,13 +237,10 @@ namespace TAO Invocation_Adapter::invoke_remote_i (TAO_Stub *stub, TAO_Operation_Details &details, CORBA::Object_var &effective_target, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { ACE_Time_Value tmp_wait_time; - bool is_timeout = - this->get_timeout (stub, - tmp_wait_time); + bool const is_timeout = this->get_timeout (stub, tmp_wait_time); if (is_timeout) max_wait_time = &tmp_wait_time; @@ -278,8 +261,7 @@ namespace TAO stub, block_connect); - resolver.resolve (max_wait_time - ); + resolver.resolve (max_wait_time); if (TAO_debug_level) { @@ -298,16 +280,14 @@ namespace TAO return this->invoke_oneway (details, effective_target, resolver, - max_wait_time - ); + max_wait_time); } else if (this->type_ == TAO_TWOWAY_INVOCATION) { return this->invoke_twoway (details, effective_target, resolver, - max_wait_time - ); + max_wait_time); } return TAO_INVOKE_FAILURE; @@ -317,8 +297,7 @@ namespace TAO Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { // Simple sanity check if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION || @@ -332,13 +311,10 @@ namespace TAO TAO_INVOKE_FAILURE); } - TAO::Synch_Twoway_Invocation synch (this->target_, - r, - details); + TAO::Synch_Twoway_Invocation synch (this->target_, r, details); Invocation_Status const status = - synch.remote_twoway (max_wait_time - ); + synch.remote_twoway (max_wait_time); if (status == TAO_INVOKE_RESTART && synch.is_forwarded ()) @@ -355,8 +331,7 @@ namespace TAO this->object_forwarded (effective_target, r.stub (), - is_permanent_forward - ); + is_permanent_forward); } return status; @@ -366,16 +341,12 @@ namespace TAO Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { - TAO::Synch_Oneway_Invocation synch (this->target_, - r, - details); + TAO::Synch_Oneway_Invocation synch (this->target_, r, details); Invocation_Status const s = - synch.remote_oneway (max_wait_time - ); + synch.remote_oneway (max_wait_time); if (s == TAO_INVOKE_RESTART && synch.is_forwarded ()) @@ -391,8 +362,7 @@ namespace TAO #endif this->object_forwarded (effective_target, r.stub (), - is_permanent_forward - ); + is_permanent_forward); } return s; @@ -401,8 +371,7 @@ namespace TAO void Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target, TAO_Stub *stub, - CORBA::Boolean permanent_forward - ) + CORBA::Boolean permanent_forward) { // The object pointer has to be changed to a TAO_Stub pointer // in order to obtain the profiles. diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index 51741319030..47727606a5b 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -87,13 +87,11 @@ namespace TAO { try { - this->adapter_->send_request (*this - ); + this->adapter_->send_request (*this); } catch ( ::CORBA::Exception& ex) { - (void) this->handle_any_exception (&ex - ); + (void) this->handle_any_exception (&ex); // This is a begin interception point throw; @@ -119,7 +117,7 @@ namespace TAO } catch ( ::CORBA::Exception& ex) { - (void) this->handle_any_exception (&ex ); + (void) this->handle_any_exception (&ex); throw; } @@ -161,8 +159,7 @@ namespace TAO } PortableInterceptor::ReplyStatus - Invocation_Base::handle_any_exception (CORBA::Exception *ex - ) + Invocation_Base::handle_any_exception (CORBA::Exception *ex) { this->exception (ex); @@ -171,8 +168,7 @@ namespace TAO if (adapter_ != 0) { - this->adapter_->receive_exception (*this - ); + this->adapter_->receive_exception (*this); if (this->forwarded_to_.in ()) { @@ -198,8 +194,7 @@ namespace TAO if (adapter_ != 0) { - this->adapter_->receive_exception (*this - ); + this->adapter_->receive_exception (*this); status = this->adapter_->reply_status (*this); diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index bc401286334..a52852f0529 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -30,21 +30,19 @@ TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout, { if (timeout != 0) { - options.set (ACE_Synch_Options::USE_REACTOR, - *timeout); + options.set (ACE_Synch_Options::USE_REACTOR, *timeout); } else { // Making it sure it is blocking. - options.set (ACE_Synch_Options::USE_REACTOR, - ACE_Time_Value::zero); + options.set (ACE_Synch_Options::USE_REACTOR, ACE_Time_Value::zero); } } int TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev, TAO_Transport *transport, - ACE_Time_Value *max_wait_time) + ACE_Time_Value *max_wait_time) { if (transport == 0) return -1; @@ -53,9 +51,7 @@ TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev, this->orb_core_->leader_follower (); int result = - leader_follower.wait_for_event (ev, - transport, - max_wait_time); + leader_follower.wait_for_event (ev, transport, max_wait_time); if (ev->error_detected () && result != -1) result = -1; diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h index 35e6e514046..515df085157 100644 --- a/TAO/tao/LF_Connect_Strategy.h +++ b/TAO/tao/LF_Connect_Strategy.h @@ -50,13 +50,10 @@ public: * Concrete implementation for this class. Please see * Connect_Strategy.h for details */ - virtual void synch_options (ACE_Time_Value *val, - ACE_Synch_Options &opt); + virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt); protected: - virtual int wait_i (TAO_LF_Event *ev, - TAO_Transport *t, - ACE_Time_Value *val); + virtual int wait_i (TAO_LF_Event *ev, TAO_Transport *t, ACE_Time_Value *val); }; diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp index cc69d6fcea3..f40ccdb1317 100644 --- a/TAO/tao/LF_Event.cpp +++ b/TAO/tao/LF_Event.cpp @@ -26,8 +26,7 @@ TAO_LF_Event::~TAO_LF_Event (void) } void -TAO_LF_Event::state_changed (int new_state, - TAO_Leader_Follower &lf) +TAO_LF_Event::state_changed (int new_state, TAO_Leader_Follower &lf) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lf.lock ()); diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 5344efdf36f..abad06792e1 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -107,8 +107,7 @@ public: */ /// Accessor to change the state. The state isnt changed unless /// certain conditions are satisfied. - void state_changed (int new_state, - TAO_Leader_Follower &lf); + void state_changed (int new_state, TAO_Leader_Follower &lf); /// Return 1 if the condition was satisfied successfully, 0 if it /// has not diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h index f6dcac517ef..c2b8ff51498 100644 --- a/TAO/tao/LF_Event_Binder.h +++ b/TAO/tao/LF_Event_Binder.h @@ -35,8 +35,7 @@ class TAO_Export TAO_LF_Event_Binder { public: /// Constructor - TAO_LF_Event_Binder (TAO_LF_Event *event, - TAO_LF_Follower *folloer); + TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *folloer); /// Destructor ~TAO_LF_Event_Binder (void); diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h index f1161f6b14f..341c5d1b6d4 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.h +++ b/TAO/tao/LF_Follower_Auto_Adder.h @@ -35,8 +35,7 @@ class TAO_Export TAO_LF_Follower_Auto_Adder { public: /// Constructor - TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &, - TAO_LF_Follower *follower); + TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &, TAO_LF_Follower *follower); /// Destructor ~TAO_LF_Follower_Auto_Adder (void); diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h index a3dfb19996e..c39e2f91191 100644 --- a/TAO/tao/LF_Strategy_Complete.h +++ b/TAO/tao/LF_Strategy_Complete.h @@ -44,8 +44,7 @@ public: virtual void set_upcall_thread (TAO_Leader_Follower &); virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time, TAO_Leader_Follower &); - virtual void reset_event_loop_thread (int call_reset, - TAO_Leader_Follower &); + virtual void reset_event_loop_thread (int call_reset, TAO_Leader_Follower &); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index 220f01e1cc8..09fc4819ed8 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -59,7 +59,7 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( return -1; } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return -1; } diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index 6095fdcd4e3..4d4eb3d9b76 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -59,15 +59,12 @@ namespace TAO TAO_Target_Specification tspec; this->init_target_spec (tspec); - TAO_Transport *transport = - this->resolver_.transport (); + TAO_Transport *transport = this->resolver_.transport (); TAO_OutputCDR &cdr = transport->out_stream (); int const retval = - transport->generate_locate_request (tspec, - this->details_, - cdr); + transport->generate_locate_request (tspec, this->details_, cdr); if (retval == -1) return TAO_INVOKE_FAILURE; @@ -75,9 +72,7 @@ namespace TAO countdown.update (); Invocation_Status s = - this->send_message (cdr, - TAO_Transport::TAO_TWOWAY_REQUEST, - max_wait_time); + this->send_message (cdr, TAO_Transport::TAO_TWOWAY_REQUEST, max_wait_time); if (s != TAO_INVOKE_SUCCESS) return s; @@ -91,9 +86,7 @@ namespace TAO this->resolver_.transport_released (); s = - this->wait_for_reply (max_wait_time, - rd, - dispatch_guard); + this->wait_for_reply (max_wait_time, rd, dispatch_guard); s = this->check_reply (rd); diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index d805a80c5e3..795f38f72f0 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -84,13 +84,13 @@ namespace TAO s = synch.invoke (max_wait_time ); } - catch ( ::CORBA::INV_POLICY&) + catch (const ::CORBA::INV_POLICY&) { this->list_ = resolver.steal_inconsistent_policies (); throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index 221ca7cfeaf..2bc39477506 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -32,7 +32,7 @@ TAO_MProfile::~TAO_MProfile (void) CORBA::Policy_ptr policy = (*this->policy_list_)[i]; policy->destroy (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Ignore all exceptions to allow other policies to be // destroyed. diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 6f34dd52d84..8b521839467 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -129,7 +129,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( reply_error ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) ex._tao_print_exception ("Exception during reply handler"); @@ -177,7 +177,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) ); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { @@ -235,7 +235,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) ); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level >= 4) { diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index 1aa3051b9a2..fc2b116f39a 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -104,7 +104,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, time_value.msec ())); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Ignore all exceptions... } diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index 1ffb963fb19..db1814ff545 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -54,7 +54,7 @@ TAO_Messaging_Loader::init (int, PortableInterceptor::register_orb_initializer (orb_initializer.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 7fb43b0f8ea..d2bc635f550 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -150,7 +150,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( { info->register_policy_factory (*i, policy_factory.in ()); } - catch ( ::CORBA::BAD_INV_ORDER& ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -162,7 +162,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( } throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... throw; diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 022de7a4acf..3d98a6f8ebb 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -107,7 +107,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, time_value.msec ())); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Ignore all exceptions... } @@ -262,7 +262,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, has_synchronization = true; scope = p->synchronization (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Ignore all exceptions... } diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 68df7c44eb5..bebf349b9be 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -126,8 +126,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) *this->lock_, -1); - result = - this->dispatcher_table_.unbind (params.request_id_, rd); + result = this->dispatcher_table_.unbind (params.request_id_, rd); if (TAO_debug_level > 8) ACE_DEBUG ((LM_DEBUG, @@ -194,7 +193,6 @@ TAO_Muxed_TMS::connection_closed (void) retval = this->clear_cache (); } while (retval != -1); - } int diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index 250d5435b42..5c70284e05a 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -45,13 +45,9 @@ class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object public: virtual ~TAO_NVList_Adapter (void); - virtual void create_list ( - CORBA::Long count, - CORBA::NVList_ptr &new_list) = 0; - - virtual void create_named_value ( - CORBA::NamedValue_ptr &nv) = 0; + virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0; + virtual void create_named_value (CORBA::NamedValue_ptr &nv) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Null_Fragmentation_Strategy.cpp b/TAO/tao/Null_Fragmentation_Strategy.cpp index 79ddde5c290..7146119c73e 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.cpp +++ b/TAO/tao/Null_Fragmentation_Strategy.cpp @@ -1,9 +1,7 @@ // $Id$ - #include "tao/Null_Fragmentation_Strategy.h" - TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy (void) { } diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h index ace58815d2d..0a70c65601d 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.h +++ b/TAO/tao/Null_Fragmentation_Strategy.h @@ -45,9 +45,7 @@ public: TAO_Null_Fragmentation_Strategy (void) {} virtual ~TAO_Null_Fragmentation_Strategy (void); - virtual int fragment (TAO_OutputCDR &, - ACE_CDR::ULong, - ACE_CDR::ULong); + virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong); private: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 63312b4bfac..6eb1c95b298 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -120,14 +120,12 @@ void CORBA::ORB::InvalidName::_raise (void) const TAO_RAISE (*this); } -void CORBA::ORB::InvalidName::_tao_encode ( - TAO_OutputCDR &) const +void CORBA::ORB::InvalidName::_tao_encode (TAO_OutputCDR &) const { throw ::CORBA::MARSHAL (); } -void CORBA::ORB::InvalidName::_tao_decode ( - TAO_InputCDR &) +void CORBA::ORB::InvalidName::_tao_decode (TAO_InputCDR &) { throw ::CORBA::MARSHAL (); } @@ -304,9 +302,7 @@ CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef, throw ::CORBA::INTF_REPOS (); } - adapter->create_operation_list (this, - opDef, - result); + adapter->create_operation_list (this, opDef, result); } @@ -437,9 +433,7 @@ CORBA::ORB::create_struct_tc ( 0); } - return adapter->create_struct_tc (id, - name, - members); + return adapter->create_struct_tc (id, name, members); } CORBA::TypeCode_ptr @@ -1476,13 +1470,13 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) // Marshal the objref into an encapsulation bytestream. (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER); - if ((cdr << obj) == 0) + if (!(cdr << obj)) ACE_THROW_RETURN (CORBA::MARSHAL (), 0); // Now hexify the encapsulated CDR data into a string, and // return that string. - const size_t total_len = cdr.total_length (); + size_t const total_len = cdr.total_length (); char *cp = 0; ACE_ALLOCATOR_RETURN (cp, @@ -1585,8 +1579,7 @@ CORBA::ORB::string_to_object (const char *str) if (ior_parser != 0) { - return ior_parser->parse_string (str, - this); + return ior_parser->parse_string (str, this); } if (ACE_OS::strncmp (str, @@ -1609,8 +1602,7 @@ CORBA::ORB::id (void) #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr -CORBA::ORB::create_policy (CORBA::PolicyType type, - const CORBA::Any& val) +CORBA::ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val) { this->check_shutdown (); @@ -1724,9 +1716,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str) TAO_Connector_Registry *conn_reg = this->orb_core_->connector_registry (); - int const retv = - conn_reg->make_mprofile (str, - mprofile); + int const retv = conn_reg->make_mprofile (str, mprofile); // Return nil. if (retv != 0) @@ -1740,14 +1730,13 @@ CORBA::ORB::url_ior_string_to_object (const char* str) } // Now make the TAO_Stub. - TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, - mprofile); + TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, mprofile); TAO_Stub_Auto_Ptr safe_objdata (data); // Figure out if the servant is collocated. - CORBA::Object_ptr obj = - this->orb_core_->create_object (safe_objdata.get ()); + CORBA::Object_ptr obj = this->orb_core_->create_object (safe_objdata.get ()); + if (CORBA::is_nil (obj)) return CORBA::Object::_nil (); @@ -1784,8 +1773,7 @@ CORBA::ORB::register_value_factory (const char *repository_id, if (vta) { - int const result = vta->vf_map_rebind (repository_id, - factory); + int const result = vta->vf_map_rebind (repository_id, factory); if (result == 0) // No previous factory found { diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 8e1581ef989..533b348acc1 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -24,9 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { void - register_orb_initializer ( - ORBInitializer_ptr init - ) + register_orb_initializer (ORBInitializer_ptr init) { { // Using ACE_Static_Object_Lock::instance() precludes @@ -69,9 +67,7 @@ namespace PortableInterceptor if (orbinitializer_registry_ != 0) { - orbinitializer_registry_->register_orb_initializer ( - init - ); + orbinitializer_registry_->register_orb_initializer (init); } else { diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 81c1d59ae05..1882b238e44 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -35,10 +35,7 @@ namespace PortableInterceptor /// Register an ORBInitializer with the global ORBInitializer /// table. - TAO_Export void register_orb_initializer ( - ORBInitializer_ptr init - - ); + TAO_Export void register_orb_initializer (ORBInitializer_ptr init); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 4b90a6adff5..3810b271482 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -55,8 +55,7 @@ namespace TAO /// Register an ORBInitializer with the underlying ORBInitializer /// array. virtual void register_orb_initializer ( - PortableInterceptor::ORBInitializer_ptr init - ) = 0; + PortableInterceptor::ORBInitializer_ptr init) = 0; /** * Begin initialization of all registered ORBInitializers before @@ -70,8 +69,7 @@ namespace TAO TAO_ORB_Core *orb_core, int argc, char *argv[], - PortableInterceptor::SlotId &slotid - ) = 0; + PortableInterceptor::SlotId &slotid) = 0; /** * Complete initialization of all registered ORBInitializers after @@ -92,8 +90,7 @@ namespace TAO TAO_ORB_Core *orb_core, int argc, char *argv[], - PortableInterceptor::SlotId slotid - ) = 0; + PortableInterceptor::SlotId slotid) = 0; }; } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index b9eb4757dfa..2b60f75309c 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1356,7 +1356,7 @@ TAO_ORB_Core::fini (void) // Shutdown the ORB and block until the shutdown is complete. this->shutdown (1); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ACE_CString message = "Exception caught in trying to shutdown "; @@ -2937,7 +2937,7 @@ TAO_ORB_Core::implrepo_service (void) // @@ Worry about assigning a different IOR? (brunsch) this->implrepo_service_ = temp._retn (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Just make sure that we have a null pointer. Ignore the exception // anyway. @@ -3285,7 +3285,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void) ior_ap_factory->create (); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ( "Cannot initialize the " @@ -3478,7 +3478,7 @@ TAO_ORB_Core::valuetype_adapter (void) vt_ap_factory->create (); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ( "Cannot initialize the " @@ -3525,7 +3525,7 @@ TAO_ORB_Core_instance (void) CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // @@ What should we do here? } diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 301cdb1427c..71e5cac98db 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -419,24 +419,20 @@ public: /// Get a policy. First, check the ORB-level Policy Manager, then /// check the ORB defaults. - CORBA::Policy_ptr get_policy (CORBA::PolicyType type - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType type); /// Get a policy. First, check the thread current, then check the /// ORB-level Policy Manager, then check the ORB defaults. - CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type - ); + CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type); /// Get a cached policy. First, check the ORB-level Policy Manager, /// then check the ORB defaults. - CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ); + CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); /// Get a cached policy. First, check the thread current, then /// check the ORB-level Policy Manager, then check the ORB defaults. CORBA::Policy_ptr get_cached_policy_including_current ( - TAO_Cached_Policy_Type type - ); + TAO_Cached_Policy_Type type); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -571,8 +567,7 @@ public: /// Register a TSS cleanup function. The slot ID for the /// corresponding ORB core TSS resource is returned by the reference /// argument. This method return 0 on success, and -1 on failure. - int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup, - size_t &slot_id); + int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup, size_t &slot_id); /// Return the underlying TSS cleanup function registry. TAO_Cleanup_Func_Registry *tss_cleanup_funcs (void); @@ -587,13 +582,10 @@ public: TAO_Thread_Lane_Resources &lane_resources (void); /// Run the event loop. - int run (ACE_Time_Value *tv, - int perform_work - ); + int run (ACE_Time_Value *tv, int perform_work); /// End the event loop - void shutdown (CORBA::Boolean wait_for_completion - ); + void shutdown (CORBA::Boolean wait_for_completion); /// Get the shutdown flag value bool has_shutdown (void) const; @@ -613,16 +605,14 @@ public: /// based on the endpoint. TAO_Stub *create_stub_object (TAO_MProfile &mprofile, const char *type_id, - CORBA::PolicyList *policy_list - ); + CORBA::PolicyList *policy_list); /// Factory method that create the "right" Stub depending on /// wheather RTCORBA is loaded or not. The factory used to create /// the stub, is loaded at ORB initialization, and its type depends /// on the fact that RTCORBA is being used or not. TAO_Stub *create_stub (const char *repository_id, - const TAO_MProfile &profiles - ); + const TAO_MProfile &profiles); /// Create a new object, use the adapter registry to create a /// collocated object, if not possible then create a regular @@ -636,8 +626,7 @@ public: /// user decides to use lazy initialization of CORBA object, then /// this is the route that we have to take to do the /// initialization. - CORBA::Long initialize_object (TAO_Stub *the_stub, - CORBA::Object_ptr obj); + CORBA::Long initialize_object (TAO_Stub *the_stub, CORBA::Object_ptr obj); /// Reinitialise a stub after the effective profile has changed. /// This will happen after a location forward has been received @@ -687,8 +676,7 @@ public: /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. - CORBA::Object_ptr resolve_rir (const char *name - ); + CORBA::Object_ptr resolve_rir (const char *name); /// Resolve the RT ORB reference for this ORB. CORBA::Object_ptr resolve_rt_orb (void); @@ -698,9 +686,7 @@ public: const char *server_id (void) const; /// List all the service known by the ORB - CORBA::ORB_ObjectIdList *list_initial_references ( - - ); + CORBA::ORB_ObjectIdList *list_initial_references (void); /// Reference counting... unsigned long _incr_refcnt (void); @@ -754,15 +740,13 @@ public: /** * For details on how this is used please see the FT service */ - CORBA::ULong hash_service (TAO_Profile *this_p, - CORBA::ULong max); + CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max); /// Call the service layers with the Service Context to check /// whether they would like to add something to the list. void service_context_list (TAO_Stub *stub, TAO_Service_Context &service_context, - CORBA::Boolean retstart - ); + CORBA::Boolean retstart); /// Return a reference to the Fault Tolerant service object. TAO_Fault_Tolerance_Service &fault_tolerance_service (void); @@ -772,16 +756,14 @@ public: /// this case. TAO::Invocation_Status service_raise_comm_failure ( IOP::ServiceContextList &clist, - TAO_Profile *profile - ); + TAO_Profile *profile); /// Raise a transient failure exception if a service is not loaded, /// else delegate to the service to see what the service has to do /// for this case. TAO::Invocation_Status service_raise_transient_failure ( IOP::ServiceContextList &clist, - TAO_Profile *profile - ); + TAO_Profile *profile); //@} @@ -803,25 +785,21 @@ public: /// Register a client request interceptor. void add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor - ); + PortableInterceptor::ClientRequestInterceptor_ptr interceptor); /// Register a server request interceptor. void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor - ); + PortableInterceptor::ServerRequestInterceptor_ptr interceptor); /// Register a client request interceptor with policies. void add_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ); + const CORBA::PolicyList& policies); /// Register a server request interceptor with policies. void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ); + const CORBA::PolicyList& policies); /// Get the Client Request Interceptor adapter. /// Will not create a new one if not available yet. @@ -834,9 +812,7 @@ public: #endif /* TAO_HAS_INTERCEPTORS */ /// Register an IOR interceptor. - void add_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor - ); + void add_interceptor (PortableInterceptor::IORInterceptor_ptr interceptor); //@} /// Return the valuetype adapter @@ -871,8 +847,7 @@ public: /// Call the libraries to handover the validators if they havent /// registered yet with the list of validators. - void load_policy_validators (TAO_Policy_Validator &validator - ); + void load_policy_validators (TAO_Policy_Validator &validator); /// Return the flushing strategy /** @@ -981,8 +956,7 @@ protected: /// Helper method to hold the common code part for -ORBEndpoint and /// -ORBListenEndpoint options. int set_endpoint_helper (const ACE_CString &lane, - const ACE_CString &endpoints - ); + const ACE_CString &endpoints); /// Return pointer to the policy factory registry associated with /// this ORB core. diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 2492c939b3e..07ccb547c7c 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -98,8 +98,7 @@ TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj) CORBA::Boolean retval = 0; if (this->ft_service_.service_callback ()) { - retval = - this->ft_service_.service_callback ()->object_is_nil (obj); + retval = this->ft_service_.service_callback ()->object_is_nil (obj); } return retval; } @@ -610,7 +609,7 @@ TAO_ORB_Core::is_permanent_forward_condition const TAO_Service_Callbacks *service_callback = this->fault_tolerance_service ().service_callback (); - const CORBA::Boolean permanent_forward_condition = + CORBA::Boolean const permanent_forward_condition = service_callback && service_callback->is_permanent_forward_condition (obj, service_context); diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index d5e751b6933..3724f359749 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -170,8 +170,7 @@ CORBA::Object::can_convert_to_ior (void) const } char* -CORBA::Object::convert_to_ior (bool, - const char*) const +CORBA::Object::convert_to_ior (bool, const char*) const { return 0; } @@ -475,11 +474,11 @@ CORBA::Object::_non_existent (void) { retval = this->proxy_broker ()->_non_existent (this); } - catch ( ::CORBA::OBJECT_NOT_EXIST&) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { retval = true; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } @@ -619,13 +618,13 @@ CORBA::Object::_validate_connection ( { tao_call.invoke (); } - catch ( ::CORBA::INV_POLICY&) + catch (const ::CORBA::INV_POLICY&) { inconsistent_policies = tao_call.get_inconsistent_policies (); retval = false; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } @@ -781,7 +780,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) orb_core->create_stub (obj->ior_->type_id.in (), mp); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) ex._tao_print_exception ( @@ -903,7 +902,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) objdata = orb_core->create_stub (type_hint.in (), mp); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) ex._tao_print_exception ( diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 55bb36094ee..f57c9399a69 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -290,8 +290,7 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0); - Object (IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); + Object (IOP::IOR *ior, TAO_ORB_Core *orb_core = 0); /// Get the underlying stub object. virtual TAO_Stub *_stubobj (void) const; diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index 38a851353de..372cc8069fa 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -144,10 +144,7 @@ TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key, TAO::Refcounted_ObjectKey (key), -1); - - - int retval = this->table_.bind (key, - key_new); + int const retval = this->table_.bind (key, key_new); if (retval != -1) { diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index aaa686edadb..bea994c294a 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -109,16 +109,14 @@ namespace TAO * new it is bounded to the table. Returns a 0 on success and a -1 * on failure. */ - int bind (const ObjectKey &key, - Refcounted_ObjectKey *&key_new); + int bind (const ObjectKey &key, Refcounted_ObjectKey *&key_new); /// Unbind an ObjectKey from the table. int unbind (TAO::Refcounted_ObjectKey *&key); protected: /// Implementation for bind (). - int bind_i (const ObjectKey &key, - Refcounted_ObjectKey *&key_new); + int bind_i (const ObjectKey &key, Refcounted_ObjectKey *&key_new); /// Implementation for unbind (). int unbind_i (Refcounted_ObjectKey *&key); diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 7892e35bf4a..88f1186acbd 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -46,7 +46,7 @@ namespace TAO 0, pbf); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Swallow the exception return T::_nil (); diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 2ecfcd75efc..56941b574ab 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -57,9 +57,7 @@ public: ~TAO_Objref_Var_T (void); TAO_Objref_Var_T<T> & operator= (T *); - TAO_Objref_Var_T<T> & operator= ( - const TAO_Objref_Var_T<T> & - ); + TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &); T * operator-> (void) const; // Cast operators. diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 53b77a2cf6b..3575003f79b 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -42,9 +42,7 @@ namespace TAO if (registered.details_.should_be_processed (is_remote_request)) { - registered.interceptor_-> - send_request (&ri - ); + registered.interceptor_->send_request (&ri); } // The starting interception point completed successfully. @@ -54,16 +52,13 @@ namespace TAO } catch ( ::PortableInterceptor::ForwardRequest& exc) { - this->process_forward_request (invocation, - exc - ); + this->process_forward_request (invocation, exc); } } void ClientRequestInterceptor_Adapter_Impl::receive_reply ( - Invocation_Base &invocation - ) + Invocation_Base &invocation) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -106,8 +101,7 @@ namespace TAO void ClientRequestInterceptor_Adapter_Impl::receive_exception ( - Invocation_Base &invocation - ) + Invocation_Base &invocation) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -137,18 +131,13 @@ namespace TAO if (registered.details_.should_be_processed (is_remote_request)) { - registered.interceptor_-> - receive_exception ( - &ri - ); + registered.interceptor_->receive_exception (&ri); } } } catch ( ::PortableInterceptor::ForwardRequest& exc) { - this->process_forward_request (invocation, - exc - ); + this->process_forward_request (invocation, exc); } catch ( ::CORBA::Exception& ex) { @@ -218,8 +207,7 @@ namespace TAO } catch ( ::PortableInterceptor::ForwardRequest& exc) { - this->process_forward_request (invocation, - exc); + this->process_forward_request (invocation, exc); } catch ( ::CORBA::Exception& ex) { @@ -272,8 +260,7 @@ namespace TAO PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies) { - this->interceptor_list_.add_interceptor (interceptor, - policies); + this->interceptor_list_.add_interceptor (interceptor, policies); } void diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index c2725c18d9f..3f43054c41a 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -59,7 +59,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) this->register_orb_initializer (orb_initializer.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 35e4022e65f..87f37f55389 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -52,7 +52,7 @@ TAO_PI_Init::Initializer (void) PortableInterceptor::register_orb_initializer (orb_initializer.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index efdf142fb7a..0bd6def0b1a 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -68,7 +68,7 @@ TAO_PI_ORBInitializer::register_policy_factories ( info->register_policy_factory (*i, this->policy_factory_.in ()); } - catch ( ::CORBA::BAD_INV_ORDER& ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -81,7 +81,7 @@ TAO_PI_ORBInitializer::register_policy_factories ( } throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... throw; diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 8d587c11162..4c8fe0aec64 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -58,7 +58,7 @@ TAO_PI_Server_Loader::init (int, PortableInterceptor::register_orb_initializer (orb_initializer.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Caught exception:"); return -1; diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 00c30c716b2..5c5c44e4fca 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -74,7 +74,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( { info->register_policy_factory (*i, policy_factory.in ()); } - catch ( ::CORBA::BAD_INV_ORDER& ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -87,7 +87,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( } throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... throw; diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index 057d604fca8..c63c768c286 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -82,7 +82,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( ++server_request.interceptor_count (); } } - catch ( ::PortableInterceptor::ForwardRequest& exc) + catch (const ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -152,7 +152,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( } } } - catch ( ::PortableInterceptor::ForwardRequest& exc) + catch (const ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -219,7 +219,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( ++server_request.interceptor_count (); } } - catch ( ::PortableInterceptor::ForwardRequest& exc) + catch (const ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -290,7 +290,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( // an intermediate interception point. } } - catch ( ::PortableInterceptor::ForwardRequest& exc) + catch (const ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -408,7 +408,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( } } } - catch ( ::PortableInterceptor::ForwardRequest& exc) + catch (const ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -439,8 +439,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( nargs, servant_upcall, exceptions, - nexceptions - ); + nexceptions); PortableInterceptor::ReplyStatus status = server_request.reply_status (); @@ -498,13 +497,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( if (registered.details_.should_be_processed (is_remote_request)) { - registered.interceptor_-> - send_other (&request_info - ); + registered.interceptor_->send_other (&request_info); } } } - catch ( ::PortableInterceptor::ForwardRequest& exc) + catch (const ::PortableInterceptor::ForwardRequest& exc) { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); @@ -529,17 +526,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( void TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ) + const CORBA::PolicyList& policies) { - this->interceptor_list_.add_interceptor (interceptor, - policies - ); + this->interceptor_list_.add_interceptor (interceptor, policies); } void -TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors ( - void) +TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void) { this->interceptor_list_.destroy_interceptors (); } @@ -564,8 +557,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current ( void TAO::ServerRequestInterceptor_Adapter_Impl::execute_command ( TAO_ServerRequest & server_request, - TAO::Upcall_Command & command - ) + TAO::Upcall_Command & command) { TAO::PICurrent_Guard const pi_guard (server_request, true /* Copy TSC to RSC */); diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index d9d403925c7..47f296a1504 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -92,8 +92,7 @@ namespace TAO void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, CORBA::ULong nexceptions, - CORBA::OctetSeq_out oc - ); + CORBA::OctetSeq_out oc); #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ /// This method implements the "intermediate" server side @@ -109,8 +108,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ); + CORBA::ULong nexceptions); /// This method an "intermediate" server side interception point. void receive_request ( @@ -119,8 +117,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ); + CORBA::ULong nexceptions); /// This method implements one of the "ending" server side /// interception points. @@ -130,8 +127,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ); + CORBA::ULong nexceptions); /// This method implements one of the "ending" server side /// interception points. @@ -141,8 +137,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ); + CORBA::ULong nexceptions); /// This method implements one of the "ending" server side /// interception points. @@ -152,8 +147,7 @@ namespace TAO size_t nargs, void * servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ); + CORBA::ULong nexceptions); //@} /// Register an interceptor. @@ -163,20 +157,17 @@ namespace TAO virtual void add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ); + const CORBA::PolicyList& policies); virtual void destroy_interceptors (void); virtual TAO::PICurrent_Impl *allocate_pi_current (void); - virtual void deallocate_pi_current ( - TAO::PICurrent_Impl *picurrent); + virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent); virtual void execute_command ( TAO_ServerRequest &server_request, - TAO::Upcall_Command &command - ); + TAO::Upcall_Command &command); private: diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp index 8a31b17ac2e..53531b2d534 100644 --- a/TAO/tao/Parser_Registry.cpp +++ b/TAO/tao/Parser_Registry.cpp @@ -33,8 +33,7 @@ TAO_Parser_Registry::open (TAO_ORB_Core *orb_core) char **names; int number_of_names = 0; - orb_core->resource_factory ()->get_parser_names (names, - number_of_names); + orb_core->resource_factory ()->get_parser_names (names, number_of_names); if (number_of_names == 0) { diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h index d4f8a91a049..3102016a818 100644 --- a/TAO/tao/Pluggable_Messaging.h +++ b/TAO/tao/Pluggable_Messaging.h @@ -115,8 +115,7 @@ public: virtual int format_message (TAO_OutputCDR &cdr) = 0; /// Do any initialisations that may be needed. - virtual void init (CORBA::Octet major, - CORBA::Octet minor) = 0; + virtual void init (CORBA::Octet major, CORBA::Octet minor) = 0; /// Parse the details of the next message from the @a incoming /// and initializes attributes of @a qd. Returns 0 if the message @@ -152,12 +151,11 @@ public: TAO_Pluggable_Reply_Params &reply_info, TAO_Queued_Data *qd) = 0; - /// Generate a reply message with the exception @a ex. virtual int generate_exception_reply ( TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params_Base ¶ms, - CORBA::Exception &ex) = 0; + const CORBA::Exception &ex) = 0; /// Is the messaging object ready for processing BiDirectional /// request/response? diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl index 7a10993036e..628d0f9c242 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.inl +++ b/TAO/tao/Pluggable_Messaging_Utils.inl @@ -18,8 +18,7 @@ TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void) ACE_INLINE void TAO_Pluggable_Reply_Params_Base::service_context_notowned ( - IOP::ServiceContextList *svc - ) + IOP::ServiceContextList *svc) { this->service_context_ = svc; } diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index 01620c2d43d..af658e2db7a 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -65,19 +65,16 @@ namespace TAO /// initialization. virtual void register_policy_factory ( CORBA::PolicyType type, - PortableInterceptor::PolicyFactory_ptr policy_factory - ) = 0; + PortableInterceptor::PolicyFactory_ptr policy_factory) = 0; /// Construct a policy of the given type with the information /// contained in the CORBA::Any @a value. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any &value - ) = 0; + const CORBA::Any &value) = 0; /// Create an empty policy, usually to be filled in later by /// demarshaling. - virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ) = 0; + virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type) = 0; /// Check if a @c PolicyFactory corresponding to the given type, /// exists. diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp index d5c986a4f41..44c07ee2549 100644 --- a/TAO/tao/Policy_Current_Impl.cpp +++ b/TAO/tao/Policy_Current_Impl.cpp @@ -8,7 +8,6 @@ # include "tao/Policy_Current_Impl.inl" #endif /* ! __ACE_INLINE__ */ - ACE_RCSID (tao, Policy_Manager, "$Id$") @@ -18,23 +17,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_Policy_Current_Impl::set_policy_overrides ( const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - - ) + CORBA::SetOverrideType set_add) { - this->manager_impl_.set_policy_overrides (policies, - set_add - ); + this->manager_impl_.set_policy_overrides (policies, set_add); } CORBA::PolicyList * -TAO_Policy_Current_Impl::get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts - - ) +TAO_Policy_Current_Impl::get_policy_overrides (const CORBA::PolicyTypeSeq & ts) { - return this->manager_impl_.get_policy_overrides (ts - ); + return this->manager_impl_.get_policy_overrides (ts); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index 7be08d5dc8e..7f0606e9199 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -33,11 +33,6 @@ #include "tao/LocalObject.h" #include "tao/Policy_Set.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Policy_Current_Impl @@ -47,19 +42,14 @@ public: TAO_Policy_Current_Impl (void); /// Obtain a single policy. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); /// Obtain a single cached policy. - CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ); + CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); // = The CORBA::PolicyManager operations - CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts - - ); + CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & ts); void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add ); @@ -71,10 +61,6 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #if defined (__ACE_INLINE__) # include "tao/Policy_Current_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl index 0c9a9536e8b..753f38fb1e5 100644 --- a/TAO/tao/Policy_Current_Impl.inl +++ b/TAO/tao/Policy_Current_Impl.inl @@ -11,19 +11,15 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void) } ACE_INLINE CORBA::Policy_ptr -TAO_Policy_Current_Impl::get_policy ( - CORBA::PolicyType policy - ) +TAO_Policy_Current_Impl::get_policy (CORBA::PolicyType policy) { return this->manager_impl_.get_policy (policy); } ACE_INLINE CORBA::Policy_ptr -TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type - ) +TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type) { - return this->manager_impl_.get_cached_policy (type - ); + return this->manager_impl_.get_cached_policy (type); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 750dcbaa7e9..2bc80902620 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -16,8 +16,7 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::PolicyList * -TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts - ) +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); @@ -26,8 +25,7 @@ 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 - ) + CORBA::SetOverrideType set_add) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::InvalidPolicies)) { diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index b3297a727d3..44b56684184 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -47,24 +47,19 @@ public: TAO_Policy_Manager (void); /// Obtain a single policy. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); /// Obtain a single cached policy. - CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ); + CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts - - ) + const CORBA::PolicyTypeSeq & ts) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ) + CORBA::SetOverrideType set_add) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::InvalidPolicies)); diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl index 4d61f6110da..04149822c24 100644 --- a/TAO/tao/Policy_Manager.inl +++ b/TAO/tao/Policy_Manager.inl @@ -11,17 +11,14 @@ TAO_Policy_Manager::TAO_Policy_Manager (void) } ACE_INLINE CORBA::Policy_ptr -TAO_Policy_Manager::get_policy ( - CORBA::PolicyType policy - ) +TAO_Policy_Manager::get_policy (CORBA::PolicyType policy) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.get_policy (policy); } ACE_INLINE CORBA::Policy_ptr -TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type - ) +TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type) { // @@ Previous code used a "double-checked locking hack" to check @@ -31,8 +28,7 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); - return this->impl_.get_cached_policy (type - ); + return this->impl_.get_cached_policy (type); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 1ec2b80722b..93f1a6beca9 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -29,7 +29,7 @@ TAO_Policy_Set::~TAO_Policy_Set (void) { this->cleanup_i (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Ignore exceptions... } @@ -72,7 +72,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 4) ex._tao_print_exception ("TAO_Policy_Set::TAO_Policy_Set"); diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 36f426dd5ed..8df15b71161 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -54,8 +54,7 @@ public: /// Copy the state from @a source, it uses the copy() operator to /// obtain independent copies of all the policies. - void copy_from (TAO_Policy_Set* source - ); + void copy_from (TAO_Policy_Set* source); /** * Modify the list of policies to include @a policies. @@ -65,18 +64,15 @@ public: * No attempt is made to validate the policies for consistency. */ void set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ); + CORBA::SetOverrideType set_add); /// Get the values (if any) for the policies in @a types, if @a /// types is an empty list the method returns *all* the current /// policies. - CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types - ); + CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types); /// Obtain a single policy. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); /// Obtain a cached policy for speedy lookups. /** @@ -90,12 +86,10 @@ public: CORBA::Policy_ptr get_cached_const_policy (TAO_Cached_Policy_Type type) const; /// Obtain a single cached policy. - CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ); + CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); /// Utility method to set a single policy. - void set_policy (const CORBA::Policy_ptr policy - ); + void set_policy (const CORBA::Policy_ptr policy); /// Returns the policy at the specified index. /// @c CORBA::Policy::_nil () is returned if the policy doesn't diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index e367522f078..660f63644a4 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -65,8 +65,7 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) void -TAO_Policy_Validator::validate (TAO_Policy_Set &policies - ) +TAO_Policy_Validator::validate (TAO_Policy_Set &policies) { this->validate_impl (policies); @@ -77,8 +76,7 @@ TAO_Policy_Validator::validate (TAO_Policy_Set &policies } void -TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies - ) +TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies) { this->merge_policies_impl (policies); diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index 747d991d4df..b666ff8bfde 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -64,14 +64,12 @@ public: * are consistent and legal. Throw an appropriate exception * if that is not the case. */ - void validate (TAO_Policy_Set &policies - ); + void validate (TAO_Policy_Set &policies); /** * Add/merge policies. **/ - void merge_policies (TAO_Policy_Set &policies - ); + void merge_policies (TAO_Policy_Set &policies); /** * Return whether the specified policy type is legal for the @@ -97,11 +95,9 @@ public: TAO_ORB_Core & orb_core() const; protected: - virtual void validate_impl (TAO_Policy_Set &policies - ) = 0; + virtual void validate_impl (TAO_Policy_Set &policies) = 0; - virtual void merge_policies_impl (TAO_Policy_Set &policies - ) = 0; + virtual void merge_policies_impl (TAO_Policy_Set &policies) = 0; virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0; diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp index 1a36cac5f5d..91820c955f9 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.cpp +++ b/TAO/tao/PortableServer/Adapter_Activator.cpp @@ -43,7 +43,7 @@ namespace TAO { child->the_activator (this); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { (void) child->destroy (1, 1); diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 737aa70f09d..e61e6b46315 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -86,11 +86,11 @@ namespace TAO _tao_retval = target->_servant ()->_repository_id (); } } - catch ( ::CORBA::OBJECT_NOT_EXIST&) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } @@ -164,11 +164,11 @@ namespace TAO _tao_retval = target->_servant ()->_get_component (); } } - catch ( ::CORBA::OBJECT_NOT_EXIST&) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } @@ -211,11 +211,11 @@ namespace TAO _tao_retval = target->_servant ()->_get_interface (); } } - catch ( ::CORBA::OBJECT_NOT_EXIST&) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { throw; } diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index 0c521f8e592..7a6aa095d29 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -42,24 +42,17 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall ( throw ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } +#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) try { - collocated_skel (servant, - args, - num_args); - } +#endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/ + collocated_skel (servant, args, num_args); #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + } catch (const ::PortableServer::ForwardRequest& forward_request) { forward_obj = CORBA::Object::_duplicate (forward_request.forward_reference.in ()); - return; - } -#else - catch (const ::CORBA::Exception&) - { - ACE_UNUSED_ARG (forward_obj); - throw; } #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/ } diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp index 50823b5cfef..7ce7d293988 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.cpp +++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp @@ -14,9 +14,7 @@ ACE_RCSID (PortableServer, TAO_BEGIN_VERSIONED_NAMESPACE_DECL void -TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, - void * - ) +TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void *) { throw ::CORBA::BAD_OPERATION (); } diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h index d4cc2342b5f..50931390395 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.h +++ b/TAO/tao/PortableServer/Local_Servant_Base.h @@ -46,9 +46,7 @@ protected: TAO_Stub *_create_stub (void); /// Throws CORBA::BAD_OPERATION exception. - void _dispatch (TAO_ServerRequest &request, - void *servant_upcall - ); + void _dispatch (TAO_ServerRequest &request, void *servant_upcall); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index e29eb94b753..6c3a108831f 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -75,7 +75,7 @@ namespace TAO { this->poa_.complete_destruction_i (); } - catch (::CORBA::Exception&ex) + catch (const::CORBA::Exception&ex) { // Ignore exceptions ex._tao_print_exception ("TAO_POA::complete_destruction_i"); diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 8c854b27170..08d88ae3bc8 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -470,9 +470,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, try { - current = parent->find_POA_i (*iterator, - 1 - ); + current = parent->find_POA_i (*iterator, 1); } catch (const PortableServer::POA::AdapterNonExistent&) { @@ -524,12 +522,9 @@ TAO_Object_Adapter::bind_poa (const poa_name &folded_name, poa_name_out system_name) { if (poa->persistent ()) - return this->bind_persistent_poa (folded_name, - poa, - system_name); + return this->bind_persistent_poa (folded_name, poa, system_name); else - return this->bind_transient_poa (poa, - system_name); + return this->bind_transient_poa (poa, system_name); } int @@ -538,31 +533,24 @@ TAO_Object_Adapter::unbind_poa (TAO_Root_POA *poa, const poa_name &system_name) { if (poa->persistent ()) - return this->unbind_persistent_poa (folded_name, - system_name); + return this->unbind_persistent_poa (folded_name, system_name); else return this->unbind_transient_poa (system_name); } int -TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key - ) +TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key) { ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START); PortableServer::ObjectId id; TAO_Root_POA *poa = 0; - this->locate_poa (key, - id, - poa - ); + this->locate_poa (key, id, poa); PortableServer::Servant servant = 0; TAO_SERVANT_LOCATION servant_location = - poa->locate_servant_i (id, - servant - ); + poa->locate_servant_i (id, servant); switch (servant_location) { @@ -586,9 +574,7 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, PortableServer::ObjectId id; TAO_Root_POA *poa = 0; - this->locate_poa (key, - id, - poa); + this->locate_poa (key, id, poa); TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, servant); @@ -618,8 +604,7 @@ TAO_Object_Adapter::open (void) ::CORBA::PolicyList policy; PortableServer::POAManager_var poa_manager = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME, - policy - ); + policy); #else PortableServer::POAManager_ptr poa_manager_ptr; ::CORBA::PolicyList policy_list; @@ -655,8 +640,7 @@ TAO_Object_Adapter::open (void) #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Merge policies from the ORB level. - this->validator ().merge_policies (policies.policies () - ); + this->validator ().merge_policies (policies.policies ()); // If any of the policy objects specified are not valid for the ORB // implementation, if conflicting policy objects are specified, or @@ -664,9 +648,7 @@ TAO_Object_Adapter::open (void) // administrative action that has not been performed, an // InvalidPolicy exception is raised containing the index in the // policies parameter value of the first offending policy object. - policies.validate_policies (this->validator (), - this->orb_core_ - ); + policies.validate_policies (this->validator (), this->orb_core_); // Construct a new POA TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME); @@ -695,8 +677,7 @@ TAO_Object_Adapter::open (void) } void -TAO_Object_Adapter::close (int wait_for_completion - ) +TAO_Object_Adapter::close (int wait_for_completion) { this->check_close (wait_for_completion); @@ -726,10 +707,8 @@ TAO_Object_Adapter::close (int wait_for_completion this->poa_manager_factory_ = 0; #endif } - CORBA::Boolean etherealize_objects = 1; - root->destroy (etherealize_objects, - wait_for_completion - ); + CORBA::Boolean etherealize_objects = true; + root->destroy (etherealize_objects, wait_for_completion); ::CORBA::release (root); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) release_poa_manager_factory (factory); @@ -737,12 +716,10 @@ TAO_Object_Adapter::close (int wait_for_completion } void -TAO_Object_Adapter::check_close (int wait_for_completion - ) +TAO_Object_Adapter::check_close (int wait_for_completion) { TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (), - wait_for_completion - ); + wait_for_completion); } int @@ -754,8 +731,7 @@ TAO_Object_Adapter::priority (void) const int TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, - CORBA::Object_out forward_to - ) + CORBA::Object_out forward_to) { if (key.length() < TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE || ACE_OS::memcmp (key.get_buffer (), @@ -983,11 +959,9 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp) try { - this->find_servant (objkey.in (), - servant - ); + this->find_servant (objkey.in (), servant); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { } @@ -1021,8 +995,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void) int TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa ( const poa_name &system_name, - TAO_Root_POA *&poa - ) + TAO_Root_POA *&poa) { poa_name folded_name; int result = this->persistent_poa_system_map_.recover_key (system_name, @@ -1030,8 +1003,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa ( if (result == 0) { - result = this->persistent_poa_system_map_.find (system_name, - poa); + result = this->persistent_poa_system_map_.find (system_name, poa); if (result != 0 || folded_name != poa->folded_name ()) { @@ -1040,10 +1012,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa ( poa); if (result != 0) { - result = - this->object_adapter_->activate_poa (folded_name, - poa - ); + result = this->object_adapter_->activate_poa (folded_name, poa); } } } @@ -1099,8 +1068,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void) int TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa ( const poa_name &system_name, - TAO_Root_POA *&poa - ) + TAO_Root_POA *&poa) { int result = this->object_adapter_->persistent_poa_name_map_->find (system_name, @@ -1108,9 +1076,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa ( if (result != 0) { result = - this->object_adapter_->activate_poa (system_name, - poa - ); + this->object_adapter_->activate_poa (system_name, poa); } return result; @@ -1123,8 +1089,7 @@ TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa ( poa_name_out system_name) { int result = - this->object_adapter_->persistent_poa_name_map_->bind (folded_name, - poa); + this->object_adapter_->persistent_poa_name_map_->bind (folded_name, poa); if (result == 0) ACE_NEW_RETURN (system_name, poa_name (folded_name), @@ -1240,8 +1205,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) ACE_OS::thr_self ())) { // If so wait... - int result = - this->non_servant_upcall_condition_.wait (); + int const result = this->non_servant_upcall_condition_.wait (); if (result == -1) throw ::CORBA::OBJ_ADAPTER (); } @@ -1255,7 +1219,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void) { this->wait_for_non_servant_upcalls_to_complete (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { ACE_ERROR ((LM_ERROR, "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete " @@ -1277,9 +1241,7 @@ TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req, TAO::Portable_Server::Servant_Upcall& upcall ) { - upcall.servant ()->_dispatch(req, - &upcall - ); + upcall.servant ()->_dispatch(req, &upcall); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 7f1583967bf..21f9262017a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -23,7 +23,7 @@ namespace TAO namespace Portable_Server { RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) : - etherealize_objects_ (1) + etherealize_objects_ (true) { } @@ -69,11 +69,9 @@ namespace TAO } this->servant_activator_ = - PortableServer::ServantActivator::_narrow (imgr - ); + PortableServer::ServantActivator::_narrow (imgr); - this->validate_servant_manager (this->servant_activator_.in () - ); + this->validate_servant_manager (this->servant_activator_.in ()); } TAO_SERVANT_LOCATION @@ -84,9 +82,7 @@ namespace TAO { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; - location = this->poa_->servant_present (system_id, - servant - ); + location = this->poa_->servant_present (system_id, servant); if (location == TAO_SERVANT_NOT_FOUND) { @@ -112,8 +108,7 @@ namespace TAO servant = this->poa_->find_servant (system_id, servant_upcall, - poa_current_impl - ); + poa_current_impl); if (servant != 0) { @@ -139,12 +134,9 @@ namespace TAO // reference. // - this->validate_servant_manager (this->servant_activator_.in () - ); + this->validate_servant_manager (this->servant_activator_.in ()); - servant = - this->incarnate_servant (poa_current_impl.object_id () - ); + servant = this->incarnate_servant (poa_current_impl.object_id ()); // If the incarnate operation returns a servant that is // already active for a different Object Id and if the POA @@ -194,8 +186,7 @@ namespace TAO CORBA::Boolean cleanup_in_progress = 0; this->etherealize_servant (poa_current_impl.object_id (), servant, - cleanup_in_progress - ); + cleanup_in_progress); // We ended up waiting on a condition variable, the // POA state may have changed while we are waiting. @@ -228,8 +219,7 @@ namespace TAO this->poa_, servant, cleanup_in_progress, - remaining_activations - ); + remaining_activations); } PortableServer::Servant @@ -248,8 +238,7 @@ namespace TAO // Invocations of etherealize on the servant manager are serialized. // Invocations of incarnate and etherealize on the servant manager are mutually exclusive. servant = this->servant_activator_->incarnate (object_id, - this->poa_ - ); + this->poa_); if (servant == 0) { @@ -301,8 +290,7 @@ namespace TAO { this->etherealize_servant (user_id, servant, - this->poa_->cleanup_in_progress () - ); + this->poa_->cleanup_in_progress ()); } else { @@ -317,7 +305,7 @@ namespace TAO // This operation causes the association of the Object Id specified // by the oid parameter and its servant to be removed from the // Active Object Map. - int result = this->poa_->unbind_using_user_id (user_id); + int const result = this->poa_->unbind_using_user_id (user_id); if (result != 0) throw ::CORBA::OBJ_ADAPTER (); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 02693960ad4..1df11bca5bf 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -235,7 +235,7 @@ namespace TAO servant_upcall.servant () ); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Ignore errors from servant locator .... } diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index b5f37deb69b..12f5ffdbc43 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -297,7 +297,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, { this->active_policy_strategies_.lifespan_strategy()->notify_startup (); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { this->poa_manager_.remove_poa (this); this->object_adapter ().unbind_poa (this, @@ -608,7 +608,7 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name, this, child_name.c_str ()); } - catch ( ::CORBA::SystemException&) + catch (const ::CORBA::SystemException&) { throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO); @@ -2437,7 +2437,7 @@ TAO_Root_POA::ORT_adapter_i (void) this ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ( "(%P|%t) Cannot initialize the " diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 94803862d60..c82ebb8b052 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -33,16 +33,13 @@ namespace TAO } void - ServantRetentionStrategyNonRetain::strategy_init ( - TAO_Root_POA *poa - ) + ServantRetentionStrategyNonRetain::strategy_init (TAO_Root_POA *poa) { poa_ = poa; } void - ServantRetentionStrategyNonRetain::strategy_cleanup ( - void) + ServantRetentionStrategyNonRetain::strategy_cleanup (void) { poa_ = 0; } @@ -66,8 +63,7 @@ namespace TAO PortableServer::ObjectId * ServantRetentionStrategyNonRetain::system_id_to_object_id ( - const PortableServer::ObjectId &system_id - ) + const PortableServer::ObjectId &system_id) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) @@ -249,9 +245,7 @@ namespace TAO priority, true); - return this->poa_->invoke_key_to_object_helper_i (intf, - user_id - ); + return this->poa_->invoke_key_to_object_helper_i (intf, user_id); } CORBA::Object_ptr @@ -274,7 +268,7 @@ namespace TAO // Otherwise, it is the NON_RETAIN policy. Therefore, user id // is the same as system id. - PortableServer::ObjectId *sys_id; + PortableServer::ObjectId *sys_id = 0; ACE_NEW_THROW_EX (sys_id, PortableServer::ObjectId (oid), CORBA::NO_MEMORY ()); @@ -289,9 +283,7 @@ namespace TAO priority, true); - return this->poa_->invoke_key_to_object_helper_i (intf, - oid - ); + return this->poa_->invoke_key_to_object_helper_i (intf, oid); } int diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 6f23b70114f..1126c01c9b0 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -253,7 +253,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, req.tao_send_reply (); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // If an exception was raised we should marshal it and send // the appropriate reply to the client @@ -274,8 +274,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req, void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req, void * servant_upcall, - void * derived_this - ) + void * derived_this) { TAO_Skeleton skel; const char *opname = req.operation (); diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 3e8bd473bd0..81bdd7f8020 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -89,8 +89,7 @@ namespace TAO const TAO::ObjectKey &key, const char *operation, CORBA::Object_out forward_to, - bool &wait_occurred_restart_call - ) + bool &wait_occurred_restart_call) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -129,21 +128,22 @@ namespace TAO // We have setup the POA Current. Record this for later use. this->state_ = POA_CURRENT_SETUP; +#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) try { +#endif /* TAO_HAS_MINIMUM_CORBA */ // Lookup the servant. this->servant_ = this->poa_->locate_servant_i (operation, this->system_id_, *this, this->current_context_, - wait_occurred_restart_call - ); + wait_occurred_restart_call); if (wait_occurred_restart_call) return TAO_Adapter::DS_FAILED; - } #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + } catch (const ::PortableServer::ForwardRequest& forward_request) { forward_to = @@ -151,11 +151,7 @@ namespace TAO return TAO_Adapter::DS_FORWARD; } #else - catch (const ::CORBA::Exception&) - { - ACE_UNUSED_ARG (forward_to); - throw; - } + ACE_UNUSED_ARG (forward_to); #endif /* TAO_HAS_MINIMUM_CORBA */ // Now that we know the servant. @@ -187,27 +183,22 @@ namespace TAO } void - Servant_Upcall::pre_invoke_remote_request ( - TAO_ServerRequest &req - ) + Servant_Upcall::pre_invoke_remote_request (TAO_ServerRequest &req) { this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request ( this->poa (), this->priority (), req, - this->pre_invoke_state_ - ); + this->pre_invoke_state_); } void - Servant_Upcall::pre_invoke_collocated_request ( - void) + Servant_Upcall::pre_invoke_collocated_request (void) { this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request ( this->poa (), this->priority (), - this->pre_invoke_state_ - ); + this->pre_invoke_state_); } void @@ -226,11 +217,10 @@ namespace TAO } ::TAO_Root_POA * - Servant_Upcall::lookup_POA (const TAO::ObjectKey &key - ) + Servant_Upcall::lookup_POA (const TAO::ObjectKey &key) { // Acquire the object adapter lock first. - int result = this->object_adapter_->lock ().acquire (); + int const result = this->object_adapter_->lock ().acquire (); if (result == -1) // Locking error. ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (), @@ -247,10 +237,7 @@ namespace TAO ); // Locate the POA. - this->object_adapter_->locate_poa (key, - this->system_id_, - this->poa_ - ); + this->object_adapter_->locate_poa (key, this->system_id_, this->poa_); return this->poa_; } @@ -340,11 +327,11 @@ namespace TAO // lock. Otherwise, the thread that wants to release this lock will // not be able to do so since it can't acquire the object adapterx // lock. - int result = this->poa_->enter(); + int const result = this->poa_->enter(); - if (result == -1) - // Locking error. - throw ::CORBA::OBJ_ADAPTER (); + if (result == -1) + // Locking error. + throw ::CORBA::OBJ_ADAPTER (); #endif /* !TAO_HAS_MINIMUM_POA == 0 */ } @@ -385,8 +372,7 @@ namespace TAO { this->poa_->cleanup_servant ( this->active_object_map_entry_->servant_, - this->active_object_map_entry_->user_id_ - ); + this->active_object_map_entry_->user_id_); } catch (...) @@ -439,8 +425,7 @@ namespace TAO catch (const ::CORBA::Exception& ex) { // Ignore exceptions - ex._tao_print_exception ( - "TAO_POA::~complete_destruction_i"); + ex._tao_print_exception ("TAO_POA::~complete_destruction_i"); } this->poa_ = 0; diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index d37db6f0745..c082224cb0f 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -44,9 +44,7 @@ namespace TAO } void - ThreadStrategySingleFactoryImpl::destroy ( - ThreadStrategy *strategy - ) + ThreadStrategySingleFactoryImpl::destroy (ThreadStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index cd9fde3aae2..c5873d0129e 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -39,9 +39,7 @@ namespace TAO virtual ThreadStrategy* create ( ::PortableServer::ThreadPolicyValue value); - virtual void destroy ( - ThreadStrategy *strategy - ); + virtual void destroy (ThreadStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index 076911b755e..6c7f92a1973 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -44,10 +44,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, if (dii_arguments_converter != 0) { - dii_arguments_converter->convert (server_request, - args, - nargs - ); + dii_arguments_converter->convert (server_request, args, nargs); } else throw ::CORBA::NO_IMPLEMENT (); @@ -55,10 +52,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, if (server_request.incoming ()) { - this->pre_upcall (*server_request.incoming (), - args, - nargs - ); + this->pre_upcall (*server_request.incoming (), args, nargs); } #if TAO_HAS_INTERCEPTORS == 1 @@ -103,8 +97,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, the_nargs, servant_upcall, exceptions, - nexceptions - ); + nexceptions); } // Don't bother performing the upcall if an interceptor caused a @@ -114,9 +107,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, { if (interceptor_adapter != 0) { - interceptor_adapter->execute_command (server_request, - command - ); + interceptor_adapter->execute_command (server_request, command); } else #endif /* TAO_HAS_INTERCEPTORS */ @@ -155,8 +146,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, the_nargs, servant_upcall, exceptions, - nexceptions - ); + nexceptions); } } } @@ -178,11 +168,9 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, the_nargs, servant_upcall, exceptions, - nexceptions - ); + nexceptions); - status = - server_request.reply_status (); + status = server_request.reply_status (); } if (status == PortableInterceptor::SYSTEM_EXCEPTION @@ -208,10 +196,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, { if (server_request.outgoing ()) { - this->post_upcall (*server_request.outgoing (), - args, - nargs - ); + this->post_upcall (*server_request.outgoing (), args, nargs); } } } @@ -219,8 +204,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, void TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr, TAO::Argument * const * args, - size_t nargs - ) + size_t nargs) { // Demarshal the operation "in" and "inout" arguments, if any. @@ -237,8 +221,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr, { if (!(*i)->demarshal (cdr)) { - TAO_InputCDR::throw_skel_exception (errno - ); + TAO_InputCDR::throw_skel_exception (errno); } } } @@ -246,8 +229,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr, void TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr, TAO::Argument * const * args, - size_t nargs - ) + size_t nargs) { // Marshal the operation "inout" and "out" arguments and return // value, if any. @@ -259,8 +241,7 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr, { if (!(*i)->marshal (cdr)) { - TAO_OutputCDR::throw_skel_exception (errno - ); + TAO_OutputCDR::throw_skel_exception (errno); } } diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index bf2c2700c29..13b2f22d776 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -509,7 +509,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl ACE_TEXT ("policies.\n"))); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // This case should occur when in the IOR are // embedded policies that TAO doesn't support, so as diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index eb4ec47a061..c80d668dd8e 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -55,8 +55,7 @@ public: virtual RTCORBA::Priority the_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void the_priority (RTCORBA::Priority the_priority - ) + virtual void the_priority (RTCORBA::Priority the_priority) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index 1d3c767d922..bc92b6104dc 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -30,7 +30,7 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, rt_stub->get_cached_policy (type ); } - catch ( ::CORBA::INV_POLICY&) + catch (const ::CORBA::INV_POLICY&) { if (r.inconsistent_policies ()) { diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 20e9e2ed233..c076c003c0a 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -111,10 +111,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po r.profile (profile); - int const status = - this->endpoint_from_profile (r, - val - ); + int const status = this->endpoint_from_profile (r, val); if (status == 1) return; @@ -129,8 +126,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po { if (r.inconsistent_policies ()) { - CORBA::PolicyList *p = - r.inconsistent_policies (); + CORBA::PolicyList *p = r.inconsistent_policies (); p->length (1); (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy); @@ -150,8 +146,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( ACE_Time_Value *val) { // Narrow to the RT Stub. - TAO_RT_Stub *rt_stub = - dynamic_cast <TAO_RT_Stub *> (r.stub ()); + TAO_RT_Stub *rt_stub = dynamic_cast <TAO_RT_Stub *> (r.stub ()); // Get the priority model policy. CORBA::Policy_var priority_model_policy = diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 0f4131d8071..946039ec5dc 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -48,34 +48,26 @@ TAO_RT_ORB::create_mutex (void) } void -TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex - ) +TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->mutex_mgr_.destroy_mutex (mutex - ); + this->mutex_mgr_.destroy_mutex (mutex); } RTCORBA::Mutex_ptr TAO_RT_ORB::create_named_mutex (const char *name, - CORBA::Boolean_out created_flag - ) + CORBA::Boolean_out created_flag) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->mutex_mgr_.create_named_mutex (name, - created_flag - ); + 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)) +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 - ); + return this->mutex_mgr_.open_named_mutex (name); } //////////////////////////////////////////////////////////////////////////////// @@ -108,8 +100,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (void) // as also indicated by the comment below. #if (TAO_HAS_NAMED_RT_MUTEXES == 1) void -TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex - ) +TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *tao_mutex = @@ -135,8 +126,7 @@ 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 - ) +TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -144,8 +134,7 @@ 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 - ) + CORBA::Boolean_out created_flag) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_NAMED_RT_MUTEXES == 1) @@ -156,15 +145,14 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, CORBA::INTERNAL ()); // Optimistic that we'll find it. - created_flag = 0; + created_flag = false; // If we find the mutex, simply return it. RTCORBA::Mutex_var mutex; - if (this->map_.find (name, - mutex) != 0) + if (this->map_.find (name, mutex) != 0) { // Oops, we didn't find it. - created_flag = 1; + created_flag = true; RTCORBA::Mutex_ptr tmp_mutex; @@ -180,9 +168,7 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, mutex = tmp_mutex; // Add it to the map. - int result = - this->map_.bind (name, - mutex); + int const result = this->map_.bind (name, mutex); if (result != 0) ACE_THROW_RETURN (CORBA::INTERNAL (), @@ -200,8 +186,7 @@ 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 - ) +TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { @@ -214,8 +199,7 @@ TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name // If we find the mutex, simply return it. RTCORBA::Mutex_var mutex; - if (this->map_.find (name, - mutex) != 0) + if (this->map_.find (name, mutex) != 0) ACE_THROW_RETURN (RTCORBA::RTORB::MutexNotFound (), RTCORBA::Mutex::_nil ()); @@ -281,8 +265,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties ( CORBA::Boolean no_delay, CORBA::Long preallocate_buffer_size, const char *mmap_filename, - const char *mmap_lockname - ) + const char *mmap_lockname) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SharedMemory_Protocol_Properties *tmp = 0; @@ -386,13 +369,11 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, } void -TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool - ) +TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { - this->tp_manager_->destroy_threadpool (threadpool - ); + this->tp_manager_->destroy_threadpool (threadpool); } RTCORBA::PriorityModelPolicy_ptr @@ -411,8 +392,7 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, } RTCORBA::ThreadpoolPolicy_ptr -TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool - ) +TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy *tmp = 0; @@ -514,18 +494,14 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb) #if defined (linux) - int sched_policy = - orb->orb_core ()->orb_params ()->ace_sched_policy (); + int const sched_policy = orb->orb_core ()->orb_params ()->ace_sched_policy (); - int minimum_priority = - ACE_Sched_Params::priority_min (sched_policy); + int const minimum_priority = ACE_Sched_Params::priority_min (sched_policy); ACE_hthread_t thread_id; ACE_Thread::self (thread_id); - return ACE_Thread::setprio (thread_id, - minimum_priority, - sched_policy); + return ACE_Thread::setprio (thread_id, minimum_priority, sched_policy); #else /* linux */ diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 110a44ab880..9c5852963c2 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -63,20 +63,15 @@ public: RTCORBA::Mutex_ptr create_mutex (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy_mutex (RTCORBA::Mutex_ptr the_mutex - ) + void destroy_mutex (RTCORBA::Mutex_ptr the_mutex) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::Mutex_ptr create_named_mutex (const char *name, - CORBA::Boolean_out created_flag - ) + CORBA::Boolean_out created_flag) ACE_THROW_SPEC ((CORBA::SystemException)); - 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) + ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)); private: @@ -125,8 +120,7 @@ public: * instances are destroyed as soon as their reference counts go to * 0. */ - virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex - ) + virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -135,16 +129,12 @@ public: * is set to 0. */ virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name, - CORBA::Boolean_out created_flag - ) + CORBA::Boolean_out created_flag) ACE_THROW_SPEC ((CORBA::SystemException)); /// 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) + ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)); /** * Create and return a TCPProtocolProperties instance with the specified @@ -157,15 +147,13 @@ public: CORBA::Boolean keep_alive, CORBA::Boolean dont_route, CORBA::Boolean no_delay, - CORBA::Boolean enable_network_priority - ) + CORBA::Boolean enable_network_priority) ACE_THROW_SPEC ((CORBA::SystemException )); RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties ( CORBA::Long send_buffer_size, - CORBA::Long recv_buffer_size - ) + CORBA::Long recv_buffer_size ) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::SharedMemoryProtocolProperties_ptr @@ -240,8 +228,7 @@ public: /// Create a ThreadpoolPolicy instance for POA creation virtual RTCORBA::ThreadpoolPolicy_ptr - create_threadpool_policy (RTCORBA::ThreadpoolId threadpool - ) + create_threadpool_policy (RTCORBA::ThreadpoolId threadpool) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -250,8 +237,7 @@ public: */ virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (const RTCORBA::PriorityBands & - priority_bands - ) + priority_bands) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -268,8 +254,7 @@ public: * communication protocols on the server side. */ virtual RTCORBA::ServerProtocolPolicy_ptr - create_server_protocol_policy (const RTCORBA::ProtocolList & protocols - ) + create_server_protocol_policy (const RTCORBA::ProtocolList & protocols) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -277,8 +262,7 @@ public: * communication protocols on the client side. */ virtual RTCORBA::ClientProtocolPolicy_ptr - create_client_protocol_policy (const RTCORBA::ProtocolList & protocols - ) + create_client_protocol_policy (const RTCORBA::ProtocolList & protocols) ACE_THROW_SPEC ((CORBA::SystemException)); /// Reference to our creating ORB Core. diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 0722dc4e0a8..1651d70f8a9 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -121,9 +121,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) TAO_Priority_Mapping_Manager_var safe_manager = manager; - info->register_initial_reference ("PriorityMappingManager", - manager - ); + info->register_initial_reference ("PriorityMappingManager", manager); // Create the initial priority mapping instance. TAO_Network_Priority_Mapping *npm = 0; @@ -156,8 +154,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) network_manager; info->register_initial_reference ("NetworkPriorityMappingManager", - network_manager - ); + network_manager); // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. @@ -200,9 +197,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) CORBA::COMPLETED_NO)); CORBA::Object_var safe_rt_current = current; - info->register_initial_reference (TAO_OBJID_RTCURRENT, - current - ); + info->register_initial_reference (TAO_OBJID_RTCURRENT, current); tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_); tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_); @@ -259,7 +254,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( { info->register_policy_factory (*i, this->policy_factory_.in ()); } - catch ( ::CORBA::BAD_INV_ORDER& ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -272,7 +267,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( } throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... throw; diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index 905a4ed1fa7..9a4cbe33ad2 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -65,20 +65,16 @@ public: long scope_policy, ACE_Time_Value const &dynamic_thread_idle_timeout); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: /// Register RTCORBA policy factories. - void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ); + void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); private: /// Instance of the RTCorba policy factory. diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 657243a34fb..12a87c1646e 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -174,10 +174,9 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) PortableInterceptor::ORBInitializer_var orb_initializer; orb_initializer = temp_orb_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ( "Unexpected exception caught while " diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h index a3e2d4cd375..4184730effb 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.h +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h @@ -42,8 +42,7 @@ public: virtual ~TAO_RT_ORB_Loader (void); /// Initialize the RT ORB loader hooks. - virtual int init (int argc, - ACE_TCHAR* []); + virtual int init (int argc, ACE_TCHAR* []); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 8fc4e57f21f..ca04f9ed871 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -55,8 +55,7 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void) } CORBA::Policy_ptr -TAO_PriorityModelPolicy::create (const CORBA::Any & - ) +TAO_PriorityModelPolicy::create (const CORBA::Any &) { /* * @@ The following code should be changed once the OMG spec has diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 90af34a3ff6..401eafaf4df 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -97,8 +97,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any &val - ); + static CORBA::Policy_ptr create (const CORBA::Any &val); protected: @@ -158,8 +157,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any &val - ); + static CORBA::Policy_ptr create (const CORBA::Any &val); protected: @@ -212,8 +210,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any &val - ); + static CORBA::Policy_ptr create (const CORBA::Any &val); protected: @@ -280,8 +277,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any &val - ); + static CORBA::Policy_ptr create (const CORBA::Any &val); protected: @@ -349,8 +345,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any &val - ); + static CORBA::Policy_ptr create (const CORBA::Any &val); protected: @@ -421,8 +416,7 @@ public: /// Helper method for the implementation of /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any &val - ); + static CORBA::Policy_ptr create (const CORBA::Any &val); protected: @@ -466,43 +460,37 @@ public: CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void send_buffer_size (CORBA::Long send_buffer_size - ) + void send_buffer_size (CORBA::Long send_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void recv_buffer_size (CORBA::Long recv_buffer_size - ) + void recv_buffer_size (CORBA::Long recv_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void keep_alive (CORBA::Boolean keep_alive - ) + void keep_alive (CORBA::Boolean keep_alive) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void dont_route (CORBA::Boolean dont_route - ) + void dont_route (CORBA::Boolean dont_route) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void no_delay (CORBA::Boolean no_delay - ) + void no_delay (CORBA::Boolean no_delay) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void enable_network_priority (CORBA::Boolean enable - ) + void enable_network_priority (CORBA::Boolean enable) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of TCPProtocolProperties. @@ -551,15 +539,13 @@ public: CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void send_buffer_size (CORBA::Long send_buffer_size - ) + void send_buffer_size (CORBA::Long send_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void recv_buffer_size (CORBA::Long recv_buffer_size - ) + void recv_buffer_size (CORBA::Long recv_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -624,29 +610,25 @@ public: CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void send_buffer_size (CORBA::Long send_buffer_size - ) + void send_buffer_size (CORBA::Long send_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void recv_buffer_size (CORBA::Long recv_buffer_size - ) + void recv_buffer_size (CORBA::Long recv_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void keep_alive (CORBA::Boolean keep_alive - ) + void keep_alive (CORBA::Boolean keep_alive) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void dont_route (CORBA::Boolean dont_route - ) + void dont_route (CORBA::Boolean dont_route) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean no_delay (void) @@ -662,22 +644,19 @@ public: CORBA::Long preallocate_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void preallocate_buffer_size (CORBA::Long preallocate_buffer_size - ) + void preallocate_buffer_size (CORBA::Long preallocate_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); char *mmap_filename (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void mmap_filename (const char *mmap_filename - ) + void mmap_filename (const char *mmap_filename) ACE_THROW_SPEC ((CORBA::SystemException)); char *mmap_lockname (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void mmap_lockname (const char *mmap_lockname - ) + void mmap_lockname (const char *mmap_lockname) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -737,8 +716,7 @@ public: CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void enable_network_priority (CORBA::Boolean enable - ) + void enable_network_priority (CORBA::Boolean enable) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of UserDatagramProtocolProperties. @@ -784,43 +762,37 @@ public: CORBA::Long send_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void send_buffer_size (CORBA::Long send_buffer_size - ) + void send_buffer_size (CORBA::Long send_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long recv_buffer_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void recv_buffer_size (CORBA::Long recv_buffer_size - ) + void recv_buffer_size (CORBA::Long recv_buffer_size) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean keep_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void keep_alive (CORBA::Boolean keep_alive - ) + void keep_alive (CORBA::Boolean keep_alive) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean dont_route (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void dont_route (CORBA::Boolean dont_route - ) + void dont_route (CORBA::Boolean dont_route) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean no_delay (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void no_delay (CORBA::Boolean no_delay - ) + void no_delay (CORBA::Boolean no_delay) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean enable_network_priority (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void enable_network_priority (CORBA::Boolean enable - ) + void enable_network_priority (CORBA::Boolean enable) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method writes a CDR representation of StreamControlProtocolProperties. diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 92fb8d082eb..139538e68d8 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -450,7 +450,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) return -1; } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index 4a9fdbe8d87..cdc16fd9a81 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -63,15 +63,12 @@ public: * policy type. Returns the effective override for all other policy * types. */ - CORBA::Policy_ptr get_policy (CORBA::PolicyType type - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType type); - CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ); + CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ); + CORBA::SetOverrideType set_add); #endif /* TAO_HAS_CORBA_MESSAGING */ diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index d1bac507e1b..109783a88af 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -53,8 +53,7 @@ public: /// Creates a Stub Object. virtual TAO_Stub *create_stub (const char *repository_id, const TAO_MProfile &profiles, - TAO_ORB_Core *orb_core - ); + TAO_ORB_Core *orb_core); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index 31bfb251a0e..3035e8c84c4 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -50,15 +50,13 @@ TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void) TAO_EndpointSet endpoint_set; - params->get_endpoint_set (TAO_DEFAULT_LANE, - endpoint_set); + params->get_endpoint_set (TAO_DEFAULT_LANE, endpoint_set); bool ignore_address = false; - int result = + int const result = this->default_lane_resources_->open_acceptor_registry (endpoint_set, - ignore_address - ); + ignore_address); return result; } diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index ef9404012f7..ba8c1bdb44a 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -60,7 +60,7 @@ TAO_Thread_Pool_Threads::svc (void) // Do the work this->run (orb_core); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // No point propagating this exception. Print it out. ACE_ERROR ((LM_ERROR, diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 0514e9b6469..f68dd67cd98 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -135,8 +135,7 @@ public: CORBA::Short lane_priority, CORBA::ULong static_threads, CORBA::ULong dynamic_threads, - ACE_Time_Value const &dynamic_thread_idle_timeout - ); + ACE_Time_Value const &dynamic_thread_idle_timeout); /// Destructor. ~TAO_Thread_Lane (void); @@ -269,8 +268,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_Time_Value const &dynamic_thread_idle_timeout); /// Constructor (for pools with lanes). TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, @@ -281,8 +279,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_Time_Value const &dynamic_thread_idle_timeout); /// Destructor. ~TAO_Thread_Pool (void); @@ -386,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_Time_Value const &dynamic_thread_idle_timeout) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a threadpool with lanes. @@ -433,8 +429,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_Time_Value const &dynamic_thread_idle_timeout) ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::ThreadpoolId @@ -449,8 +444,7 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); RTCORBA::ThreadpoolId - create_threadpool_helper (TAO_Thread_Pool *thread_pool - ) + create_threadpool_helper (TAO_Thread_Pool *thread_pool) ACE_THROW_SPEC ((CORBA::SystemException)); // @} diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 7379cd8df3d..9da4313a3fd 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -343,7 +343,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { // Eat up the exception. ex._tao_print_exception ( diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 42358836865..151fd8879d0 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -639,7 +639,7 @@ DTTask::svc (void) this->current_->end_scheduling_segment (this->name_.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Caught exception:"); return -1; diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index 419a30d8468..f30e2dfa964 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -56,7 +56,7 @@ TAO_RTScheduler_Loader::init (int, PortableInterceptor::register_orb_initializer (orb_initializer.in () ); } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ( "Unexpected exception caught while initializing the RTScheduler:"); diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index aabeae14ece..c499d30905f 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -291,7 +291,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri->get_request_service_context (Server_Interceptor::SchedulingInfo ); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index dcba0a754f0..707c9ca9c4f 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -79,7 +79,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev, break; } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { result = -1; } diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp index 31191cc3cd2..167e74e8b8a 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.cpp +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -42,7 +42,7 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport, result = orb_core->run (max_wait_time, 1); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return -1; } @@ -66,7 +66,7 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport) return -1; } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return -1; } diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index d2893173fbf..10c0805d385 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -77,9 +77,7 @@ namespace TAO CORBA::ULong index = 0; IOP::IOR *ior_info = 0; int const retval = - this->resolver_.stub ()->create_ior_info (ior_info, - index - ); + this->resolver_.stub ()->create_ior_info (ior_info, index); if (retval == -1) { @@ -95,8 +93,7 @@ namespace TAO return; } - target_spec.target_specifier (*ior_info, - index); + target_spec.target_specifier (*ior_info, index); break; } @@ -129,8 +126,6 @@ namespace TAO { throw ::CORBA::MARSHAL (); } - - return; } Invocation_Status @@ -141,7 +136,7 @@ namespace TAO TAO_Protocols_Hooks *tph = this->resolver_.stub ()->orb_core ()->get_protocols_hooks (); - CORBA::Boolean set_client_network_priority = + CORBA::Boolean const set_client_network_priority = tph->set_client_network_priority (this->resolver_.transport ()->tag (), this->resolver_.stub ()); diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h index a5a71c9116c..066cb23f624 100644 --- a/TAO/tao/Remote_Invocation.h +++ b/TAO/tao/Remote_Invocation.h @@ -66,23 +66,19 @@ namespace TAO protected: /// Initialize the @a spec. - void init_target_spec (TAO_Target_Specification &spec - ); + void init_target_spec (TAO_Target_Specification &spec); /// Write the GIOP header into the stream. void write_header (TAO_Target_Specification &spec, - TAO_OutputCDR &out_stream - ); + TAO_OutputCDR &out_stream); /// Marshal the arguments into the stream. - void marshal_data (TAO_OutputCDR &cdr - ); + void marshal_data (TAO_OutputCDR &cdr); /// Write the message onto the socket Invocation_Status send_message (TAO_OutputCDR &cdr, short message_semantics, - ACE_Time_Value *max_wait_time - ); + ACE_Time_Value *max_wait_time); protected: /// Our resolver diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index 79d1fb39f07..ab3ad6e9882 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -55,8 +55,7 @@ TAO_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr, TAO::Invocation_Status TAO_Service_Callbacks::raise_comm_failure ( IOP::ServiceContextList &, - TAO_Profile * /*profile*/ - ) + TAO_Profile * /*profile*/) { ACE_THROW_RETURN (CORBA::COMM_FAILURE ( CORBA::SystemException::_tao_minor_code ( @@ -69,8 +68,7 @@ TAO_Service_Callbacks::raise_comm_failure ( TAO::Invocation_Status TAO_Service_Callbacks::raise_transient_failure ( IOP::ServiceContextList &, - TAO_Profile * /*profile*/ - ) + TAO_Profile * /*profile*/ ) { ACE_THROW_RETURN (CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h index 3c160e521b0..0f9b90e458a 100644 --- a/TAO/tao/Service_Context.h +++ b/TAO/tao/Service_Context.h @@ -80,8 +80,7 @@ public: /// If the replace flag is true, update the specified context. /// Return 0 if the component was present and the replace flag /// was not set to true. - int set_context (const IOP::ServiceContext &context, - CORBA::Boolean replace); + int set_context (const IOP::ServiceContext &context, CORBA::Boolean replace); /// Insert the component into the list, but efficiently stealing the /// contents of the octet sequence. diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp index 93c665bf99f..7f3dfd91d76 100644 --- a/TAO/tao/Strategies/COIOP_Transport.cpp +++ b/TAO/tao/Strategies/COIOP_Transport.cpp @@ -94,9 +94,7 @@ TAO_COIOP_Transport::send (iovec *, } ssize_t -TAO_COIOP_Transport::recv (char *, - size_t , - const ACE_Time_Value *) +TAO_COIOP_Transport::recv (char *, size_t , const ACE_Time_Value *) { return 0; } diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index dcf01927702..d60634a8a0d 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -684,7 +684,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) // before the object key. for (size_t i = 0; i < len; ++i) if (options[i] == option_delimiter) - option_count++; + ++option_count; // The idea behind the following loop is to split the options into // (option, name) pairs. diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index ca8f2f86d1f..f630807e90e 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -143,7 +143,7 @@ TAO_DIOP_Connection_Handler::open (void*) tph->server_protocol_properties_at_orb_level (protocol_properties); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return -1; } diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index f919184461d..9708dbdffd2 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -144,19 +144,14 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint if (r->blocked_connect () || (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ())) { - const size_t endpoint_count = - r->profile ()->endpoint_count (); + const size_t endpoint_count = r->profile ()->endpoint_count (); - TAO_Endpoint *ep = - r->profile ()->endpoint (); + TAO_Endpoint *ep = r->profile ()->endpoint (); for (size_t i = 0; i < endpoint_count; ++i) { TAO_Base_Transport_Property desc (ep); - const bool retval = - r->try_connect (&desc, - max_wait_time - ); + const bool retval = r->try_connect (&desc, max_wait_time); // Check if the connect has completed. if (retval) diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index e8d1a2ec799..a4408abdd2f 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -123,7 +123,7 @@ TAO_SCIOP_Connection_Handler::open (void*) tph->server_protocol_properties_at_orb_level (protocol_properties); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { return -1; } diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index fa502e57458..d90a04cc655 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -237,8 +237,7 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, } int -TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, - ACE_OFF_T size) +TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, ACE_OFF_T size) { this->mmap_file_prefix_ = prefix; this->mmap_size_ = size; @@ -247,8 +246,7 @@ TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, } int -TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, - ACE_Reactor *reactor) +TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) { this->orb_core_ = orb_core; diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 3b04e2fc151..861d4828250 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -107,7 +107,7 @@ TAO_SHMIOP_Connection_Handler::open (void*) tph->server_protocol_properties_at_orb_level (protocol_properties); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return -1; } diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index a02b6d8f748..815adace6b4 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -104,7 +104,7 @@ TAO_UIOP_Connection_Handler::open (void*) tph->server_protocol_properties_at_orb_level (protocol_properties); } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { return -1; } diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index 91eefcecd09..0399804ad53 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -63,8 +63,7 @@ TAO_UIOP_Protocol_Factory::make_acceptor (void) } int -TAO_UIOP_Protocol_Factory::init (int /* argc */, - ACE_TCHAR* /* argv */ []) +TAO_UIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ []) { return 0; } diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp index d314968e62d..0ab0d04ffd2 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp @@ -54,7 +54,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void) TAO_Acceptor *acceptor = 0; // We are Lite factory - CORBA::Boolean lite_factory = 1; + CORBA::Boolean lite_factory = true; ACE_NEW_RETURN (acceptor, TAO_UIOP_Acceptor (lite_factory), 0); @@ -63,8 +63,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void) } int -TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */, - ACE_TCHAR* /* argv */ []) +TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ []) { return 0; } @@ -75,7 +74,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_connector (void) TAO_Connector *connector = 0; // We are a lite factory - CORBA::Boolean lite_factory = 1; + CORBA::Boolean lite_factory = true; ACE_NEW_RETURN (connector, TAO_UIOP_Connector (lite_factory), 0); diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index d8befc55809..b7bf67f65f8 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -36,7 +36,8 @@ public: * etc. * */ -class TAO_Strategies_Export TAO_Advanced_Resource_Factory : public TAO_Default_Resource_Factory +class TAO_Strategies_Export TAO_Advanced_Resource_Factory : + public TAO_Default_Resource_Factory { public: // = Initialization and termination methods. diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 7630447ac0d..38ae601c3a4 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -155,9 +155,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, } int -TAO_Stub::create_ior_info (IOP::IOR *&ior_info, - CORBA::ULong &index - ) +TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index) { // We are creating the IOR info. Let us not be disturbed. So grab a // lock. @@ -172,9 +170,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, { if (this->forwarded_ior_info_ == 0) { - this->get_profile_ior_info (*this->forward_profiles_, - tmp_info - ); + this->get_profile_ior_info (*this->forward_profiles_, tmp_info); this->forwarded_ior_info_ = tmp_info; } @@ -198,9 +194,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, // Else we look at the base profiles if (this->ior_info_ == 0) { - this->get_profile_ior_info (this->base_profiles_, - tmp_info - ); + this->get_profile_ior_info (this->base_profiles_, tmp_info); this->ior_info_ = tmp_info; } @@ -210,8 +204,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, ind < this->base_profiles_.profile_count (); ++ind) { - if (this->base_profiles_.get_profile (ind) == - this->profile_in_use_) + if (this->base_profiles_.get_profile (ind) == this->profile_in_use_) { index = ind; ior_info = this->ior_info_; @@ -244,17 +237,12 @@ TAO_Stub::object_key (void) const } int -TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, - IOP::IOR *&ior_info - ) +TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info) { - - ACE_NEW_THROW_EX (ior_info, IOP::IOR (), CORBA::NO_MEMORY ()); - // Get the number of elements CORBA::ULong const count = profiles.profile_count (); @@ -267,8 +255,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, { TAO_Profile *prof = profiles.get_profile (index); - IOP::TaggedProfile *tp = - prof->create_tagged_profile (); + IOP::TaggedProfile *tp = prof->create_tagged_profile (); if (tp == 0) ACE_THROW_RETURN (CORBA::NO_MEMORY (), @@ -292,8 +279,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated) } else { - this->object_proxy_broker_ = - the_tao_remote_object_proxy_broker (); + this->object_proxy_broker_ = the_tao_remote_object_proxy_broker (); } this->is_collocated_ = collocated; } @@ -305,8 +291,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated) // NOTE that this must NOT go across the network! CORBA::ULong -TAO_Stub::hash (CORBA::ULong max - ) +TAO_Stub::hash (CORBA::ULong max) { // we rely on the profile objects that its address info return this->base_profiles_.hash (max); @@ -425,8 +410,7 @@ TAO_Stub::forward_back_one (void) // specific reconciliation, etc. CORBA::Policy_ptr -TAO_Stub::get_policy (CORBA::PolicyType type - ) +TAO_Stub::get_policy (CORBA::PolicyType type) { // No need to lock, the stub only changes its policies at // construction time... @@ -434,24 +418,19 @@ TAO_Stub::get_policy (CORBA::PolicyType type CORBA::Policy_var result; if (this->policies_ != 0) { - result = - this->policies_->get_policy (type - ); + result = this->policies_->get_policy (type); } if (CORBA::is_nil (result.in ())) { - result = - this->orb_core_->get_policy_including_current (type - ); + result = this->orb_core_->get_policy_including_current (type); } return result._retn (); } CORBA::Policy_ptr -TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type - ) +TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type) { // No need to lock, the stub only changes its policies at // construction time... @@ -459,18 +438,13 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type CORBA::Policy_var result; if (this->policies_ != 0) { - result = - this->policies_->get_cached_policy (type - ); - - + result = this->policies_->get_cached_policy (type); } if (CORBA::is_nil (result.in ())) { result = - this->orb_core_->get_cached_policy_including_current (type - ); + this->orb_core_->get_cached_policy_including_current (type); } return result._retn (); @@ -478,8 +452,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type TAO_Stub * TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ) + CORBA::SetOverrideType set_add) { // Notice the use of an explicit constructor.... auto_ptr<TAO_Policy_Set> policy_manager ( @@ -487,29 +460,22 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, if (set_add == CORBA::SET_OVERRIDE) { - policy_manager->set_policy_overrides (policies, - set_add - ); + policy_manager->set_policy_overrides (policies, set_add); } else if (this->policies_ == 0) { - policy_manager->set_policy_overrides (policies, - CORBA::SET_OVERRIDE - ); + policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE); } else { policy_manager->copy_from (this->policies_ ); - policy_manager->set_policy_overrides (policies, - set_add - ); + policy_manager->set_policy_overrides (policies, set_add); } TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (), - this->base_profiles_ - ); + this->base_profiles_); stub->policies_ = policy_manager.release (); @@ -520,8 +486,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, } CORBA::PolicyList * -TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types - ) +TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { if (this->policies_ == 0) { @@ -534,8 +499,7 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types } else { - return this->policies_->get_policy_overrides (types - ); + return this->policies_->get_policy_overrides (types); } } @@ -549,13 +513,10 @@ TAO_Stub::transport_queueing_strategy (void) bool has_synchronization; Messaging::SyncScope scope; - this->orb_core_->call_sync_scope_hook (this, - has_synchronization, - scope); + this->orb_core_->call_sync_scope_hook (this, has_synchronization, scope); if (has_synchronization == true) - return this->orb_core_->get_transport_queueing_strategy (this, - scope); + return this->orb_core_->get_transport_queueing_strategy (this, scope); #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ @@ -590,7 +551,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) } else { - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, + ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->profile_lock_ptr_, 0)); diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 2d208e01a1e..d3b711d460e 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -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 - ) + Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)); protected: @@ -92,19 +91,16 @@ namespace TAO * example the DII needs a totally different method of * user exception exception handling */ - virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr - ) + virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr) ACE_THROW_SPEC ((CORBA::Exception)); /// Helper method used to handle location forwarded replies. - Invocation_Status location_forward (TAO_InputCDR &cdr - ) + Invocation_Status location_forward (TAO_InputCDR &cdr) ACE_THROW_SPEC ((CORBA::SystemException)); /// Helper method used to handle system exceptions from the remote /// objects. - Invocation_Status handle_system_exception (TAO_InputCDR &cdr - ) + Invocation_Status handle_system_exception (TAO_InputCDR &cdr) ACE_THROW_SPEC ((CORBA::SystemException)); /// As the name suggests waits for a reply from the remote ORB. @@ -113,8 +109,7 @@ namespace TAO */ Invocation_Status wait_for_reply (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd, - TAO_Bind_Dispatcher_Guard &bd - ) + TAO_Bind_Dispatcher_Guard &bd) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -124,10 +119,7 @@ namespace TAO /** * This method returns an exception when there is an error. */ - Invocation_Status check_reply_status ( - TAO_Synch_Reply_Dispatcher &rd - ); - + Invocation_Status check_reply_status (TAO_Synch_Reply_Dispatcher &rd); }; /** @@ -167,8 +159,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 - ) + Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time) ACE_THROW_SPEC ((CORBA::Exception)); }; @@ -182,8 +173,7 @@ namespace TAO { public: - Reply_Guard (Invocation_Base *s, - Invocation_Status is); + Reply_Guard (Invocation_Base *s, Invocation_Status is); /// The destructor calls Invocation_Base::reply_received with the /// right reply status, which is useful for PI's. diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 18666d56946..448e00e270f 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -383,7 +383,7 @@ TAO_ServerRequest::tao_send_reply (void) } void -TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex) +TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) { if (this->response_expected_ && !this->collocated ()) { diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 8034d920b28..ff0129ade41 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -223,7 +223,7 @@ public: void tao_send_reply (void); - void tao_send_reply_exception (CORBA::Exception&); + void tao_send_reply_exception (const CORBA::Exception& ex); /// Set the boolean member to 1. void is_dsi (void); diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp index 4215620b9ae..7fa3bae6832 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/Current_Impl.cpp @@ -60,8 +60,7 @@ namespace TAO { static const TAO::Transport::Stats dummy; - const TAO_Transport* t = - this->transport (); + const TAO_Transport* t = this->transport (); return (t==0 || t->stats () == 0) ? &dummy : t->stats (); } @@ -69,8 +68,7 @@ namespace TAO CORBA::Long Current_Impl::id (void) ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { - const TAO_Transport* t = - this->transport (); + const TAO_Transport* t = this->transport (); return (t==0) ? 0 : t->id (); } diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp index 86e5bddbc26..40b6dbba38f 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/Current_Loader.cpp @@ -54,8 +54,7 @@ namespace TAO PortableInterceptor::ORBInitializer_var initializer (tmp); - PortableInterceptor::register_orb_initializer (initializer.in () - ); + PortableInterceptor::register_orb_initializer (initializer.in ()); return 0; } @@ -91,9 +90,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* defined (TAO_AS_STATIC_LIBS) */ - - - ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader, ACE_TEXT ("TAO_Transport_Current_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp index 339ec752f16..61300fa35aa 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp @@ -27,8 +27,7 @@ namespace TAO template <typename Impl> TAO::Transport::Current_ptr Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core, - size_t tss_slot_id - ) + size_t tss_slot_id) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the Current diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp index a8a39de3df5..816f99d153c 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp @@ -24,9 +24,9 @@ namespace TAO void - Current_ORBInitializer_Base::pre_init (PortableInterceptor::ORBInitInfo_ptr info - ) - ACE_THROW_SPEC( (CORBA::SystemException) ) + 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. @@ -60,8 +60,8 @@ namespace TAO } void - Current_ORBInitializer_Base::post_init (PortableInterceptor::ORBInitInfo_ptr - ) + Current_ORBInitializer_Base::post_init ( + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC( (CORBA::SystemException) ) { // do nothing diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp index 00025783a9d..0baa96ffe6c 100644 --- a/TAO/tao/Transport_Queueing_Strategies.cpp +++ b/TAO/tao/Transport_Queueing_Strategies.cpp @@ -110,7 +110,7 @@ namespace TAO } bcp->get_buffering_constraint (buffering_constraint); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { return true; } diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index b0796f39060..e07ded0d198 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -322,7 +322,7 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void) ); } } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // ignore any exceptions.. } diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index ca6e0e6f9bf..b8f4f03b017 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -18,7 +18,7 @@ TAO::Utils::Servant_Var<T>::_duplicate (T * p) p->_add_ref (); } } - catch (...) + catch (const...) { throw; } @@ -88,7 +88,7 @@ TAO::Utils::Servant_Var<T>::~Servant_Var (void) ptr_->_remove_ref (); } } - catch (...) + catch (const...) { // Forget the exception.. } diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index 29b878a9f17..48e39867815 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -113,7 +113,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) } } } - catch ( ::CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception (name_); result = -1; diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp index 7eb73f779ec..5c31e1827aa 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.cpp +++ b/TAO/tao/Valuetype/AbstractBase_T.cpp @@ -59,7 +59,7 @@ namespace TAO ); } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Consume and return proxy return proxy; diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp index a8832b4a416..65159a31c69 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.cpp +++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp @@ -44,16 +44,16 @@ namespace TAO ~Nested_Upcall_Guard (void) { - TAO_ORB_Core_TSS_Resources *tss = - t_->orb_core ()->get_tss_resources (); + TAO_ORB_Core_TSS_Resources *tss = t_->orb_core ()->get_tss_resources (); - tss->upcalls_temporarily_suspended_on_this_thread_ = - false; + tss->upcalls_temporarily_suspended_on_this_thread_ = false; if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait " - "re-enabling upcalls on thread %t\n")); + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait " + "re-enabling upcalls on thread %t\n")); + } } private: diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index cf8f249046b..2747d685ec5 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -54,8 +54,7 @@ public: * variables because the reply may arrive *before* the user calls * wait. */ - virtual int sending_request (TAO_ORB_Core *orb_core, - int two_way); + virtual int sending_request (TAO_ORB_Core *orb_core, int two_way); /// Base class virtual method. Wait till the @c reply_received flag is /// true or the time expires. diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 383fb11b695..0fd3bf00610 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -26,15 +26,13 @@ TAO_Operation_Details::corba_exception (const char *id) { for (CORBA::ULong i = 0; i != this->ex_count_; ++i) { - if (ACE_OS::strcmp (id, - this->ex_data_[i].id) != 0) + if (ACE_OS::strcmp (id, this->ex_data_[i].id) != 0) { continue; } // Create an exception object - CORBA::Exception *exception = - this->ex_data_[i].alloc (); + CORBA::Exception *exception = this->ex_data_[i].alloc (); if (exception == 0) { |