diff options
Diffstat (limited to 'TAO/tao/PortableServer')
17 files changed, 25 insertions, 49 deletions
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index bd30f17ad50..e7e9478d11d 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -508,8 +508,7 @@ TAO_Unique_Id_Strategy::bind_using_user_id ( "TAO (%P|%t) - TAO_Unique_Id_Strategy::" "bind_using_user_id: type=%C, id=%C\n", repository_id.in (), - hex_idstr.c_str() - )); + hex_idstr.c_str())); } #endif @@ -534,8 +533,7 @@ TAO_Unique_Id_Strategy::unbind_using_user_id ( TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Unique_Id_Strategy::unbind_using_user_id: id=%C\n", - hex_idstr.c_str() - )); + hex_idstr.c_str())); } if (entry->servant_ != 0) @@ -731,8 +729,7 @@ TAO_Multiple_Id_Strategy::unbind_using_user_id ( TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Multiple_Id_Strategy::unbind_using_user_id: id=%C\n", - hex_idstr.c_str() - )); + hex_idstr.c_str())); } result = this->active_object_map_->id_hint_strategy_->unbind (*entry); diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index 292af28f3fe..ea69a7d7c71 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -155,8 +155,7 @@ interceptor_value (CORBA::Any *any) const typedef typename S_var::s_traits::from_type from_type; Insert_Policy<from_type>::any_insert ( any, - from_type (this->x_.in (), BOUND) - ); + from_type (this->x_.in (), BOUND)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index fa862566239..c93cae20dc6 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -233,8 +233,6 @@ _TAO_collocation_Object_Proxy_Broker_Factory_Initializer (size_t) static int _TAO_collocation_Object_Proxy_Broker_Factory_Initializer_Scarecrow = _TAO_collocation_Object_Proxy_Broker_Factory_Initializer ( - reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer - ) - ); + reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer)); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 1d6a722f548..f215d512ae1 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -50,8 +50,7 @@ namespace TAO void IdUniquenessStrategyFactoryImpl::destroy ( - IdUniquenessStrategy *strategy - ) + IdUniquenessStrategy *strategy) { switch (strategy->type ()) { diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 30563653abf..c805fabf79d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -14,15 +14,13 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_init ( - TAO_Root_POA *poa - ) + TAO_Root_POA *poa) { poa_ = poa; } void - IdUniquenessStrategyUnique::strategy_cleanup ( - ) + IdUniquenessStrategyUnique::strategy_cleanup () { poa_ = 0; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 571175c03cf..71383493628 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -33,8 +33,7 @@ namespace TAO void IdUniquenessStrategyUniqueFactoryImpl::destroy ( - IdUniquenessStrategy *strategy - ) + IdUniquenessStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index c2172cc7cb9..d9035f5bcae 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -44,8 +44,7 @@ namespace TAO void ImplicitActivationStrategyFactoryImpl::destroy ( - ImplicitActivationStrategy * /*strategy*/ - ) + ImplicitActivationStrategy * /*strategy*/) { // Noop because both types are singletons } diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl index 664b6a09c8c..5a931cd93e6 100644 --- a/TAO/tao/PortableServer/POA.pidl +++ b/TAO/tao/PortableServer/POA.pidl @@ -113,16 +113,13 @@ module PortableServer #endif # if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) ImplicitActivationPolicy create_implicit_activation_policy ( - in ImplicitActivationPolicyValue value - ); + in ImplicitActivationPolicyValue value); ServantRetentionPolicy create_servant_retention_policy ( - in ServantRetentionPolicyValue value - ); + in ServantRetentionPolicyValue value); RequestProcessingPolicy create_request_processing_policy ( - in RequestProcessingPolicyValue value - ); + in RequestProcessingPolicyValue value); # endif // POA attributes diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl index e50901d097f..baacfce238a 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.pidl +++ b/TAO/tao/PortableServer/POAManagerFactory.pidl @@ -35,8 +35,8 @@ module PortableServer POAManager create_POAManager( in string id, - in CORBA::PolicyList policies - ) raises(ManagerAlreadyExists, CORBA::PolicyError); + in CORBA::PolicyList policies) + raises(ManagerAlreadyExists, CORBA::PolicyError); POAManagerSeq list(); diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 9660fdfede2..4b3ac88f9c4 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -40,8 +40,7 @@ namespace TAO } void - Cached_Policies::update (TAO_POA_Policy_Set &policy_set - ) + Cached_Policies::update (TAO_POA_Policy_Set &policy_set) { for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++) { @@ -52,8 +51,7 @@ namespace TAO } void - Cached_Policies::update_policy (const CORBA::Policy_ptr policy - ) + Cached_Policies::update_policy (const CORBA::Policy_ptr policy) { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index d95abb8b3ca..e47ea8010a6 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -15,8 +15,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ) + TAO_Object_Adapter *object_adapter) : TAO_Root_POA (name, poa_manager, policies, @@ -24,8 +23,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, lock, thread_lock, orb_core, - object_adapter - ), + object_adapter), parent_ (parent) { } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index b8661b7fd00..cd58b8697d9 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -83,8 +83,7 @@ namespace TAO TAO_SERVANT_LOCATION RequestProcessingStrategyDefaultServant::locate_servant ( const PortableServer::ObjectId & system_id, - PortableServer::Servant & servant - ) + PortableServer::Servant & servant) { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 85cd906d642..2ba133bb309 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -233,8 +233,7 @@ namespace TAO void RequestProcessingStrategyServantActivator::cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ) + const PortableServer::ObjectId &user_id) { // If a servant manager is associated with the POA, // ServantLocator::etherealize will be invoked with the oid and the diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 2650c125988..5d5881e9582 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -39,8 +39,7 @@ namespace TAO void ServantRetentionStrategyNonRetainFactoryImpl::destroy ( - ServantRetentionStrategy *strategy - ) + ServantRetentionStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index df444547a4b..ab5b254407c 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -36,8 +36,7 @@ namespace TAO void ServantRetentionStrategyRetainFactoryImpl::destroy ( - ServantRetentionStrategy *strategy - ) + ServantRetentionStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index a444714bd23..03673db270e 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -52,8 +52,7 @@ namespace TAO void ThreadStrategyFactoryImpl::destroy ( - ThreadStrategy *strategy - ) + ThreadStrategy *strategy) { switch (strategy->type ()) { diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 199c000a022..ce95fbe024c 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -68,8 +68,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, typedef typename S_forany::_slice_type slice_type; Insert_Policy<S_forany>::any_insert ( any, - S_forany (const_cast <slice_type *>(this->x_)) - ); + S_forany (const_cast <slice_type *>(this->x_))); } #endif /* TAO_HAS_INTERCEPTORS */ |