diff options
Diffstat (limited to 'TAO/tao/Stub.cpp')
| -rw-r--r-- | TAO/tao/Stub.cpp | 104 |
1 files changed, 26 insertions, 78 deletions
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 5cf600ee90c..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 - ACE_ENV_ARG_DECL) +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,10 +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 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->get_profile_ior_info (*this->forward_profiles_, tmp_info); this->forwarded_ior_info_ = tmp_info; } @@ -199,10 +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 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->get_profile_ior_info (this->base_profiles_, tmp_info); this->ior_info_ = tmp_info; } @@ -212,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_; @@ -246,17 +237,11 @@ TAO_Stub::object_key (void) const } int -TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, - IOP::IOR *&ior_info - ACE_ENV_ARG_DECL) +TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info) { - - ACE_NEW_THROW_EX (ior_info, IOP::IOR (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (-1); - // Get the number of elements CORBA::ULong const count = profiles.profile_count (); @@ -270,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 (), @@ -295,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; } @@ -308,11 +291,10 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated) // NOTE that this must NOT go across the network! CORBA::ULong -TAO_Stub::hash (CORBA::ULong max - ACE_ENV_ARG_DECL) +TAO_Stub::hash (CORBA::ULong max) { // we rely on the profile objects that its address info - return this->base_profiles_.hash (max ACE_ENV_ARG_PARAMETER); + return this->base_profiles_.hash (max); } // Expensive comparison of objref data, to see if two objrefs @@ -428,8 +410,7 @@ TAO_Stub::forward_back_one (void) // specific reconciliation, etc. CORBA::Policy_ptr -TAO_Stub::get_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) +TAO_Stub::get_policy (CORBA::PolicyType type) { // No need to lock, the stub only changes its policies at // construction time... @@ -437,26 +418,19 @@ TAO_Stub::get_policy (CORBA::PolicyType type CORBA::Policy_var result; if (this->policies_ != 0) { - result = - this->policies_->get_policy (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK (CORBA::Policy::_nil ()); + result = this->policies_->get_policy (type); } if (CORBA::is_nil (result.in ())) { - result = - this->orb_core_->get_policy_including_current (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK (CORBA::Policy::_nil ()); + 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 - ACE_ENV_ARG_DECL) +TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type) { // No need to lock, the stub only changes its policies at // construction time... @@ -464,20 +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 - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - + result = this->policies_->get_cached_policy (type); } if (CORBA::is_nil (result.in ())) { result = - this->orb_core_->get_cached_policy_including_current (type - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->orb_core_->get_cached_policy_including_current (type); } return result._retn (); @@ -485,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 - ACE_ENV_ARG_DECL) + CORBA::SetOverrideType set_add) { // Notice the use of an explicit constructor.... auto_ptr<TAO_Policy_Set> policy_manager ( @@ -494,34 +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 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + policy_manager->set_policy_overrides (policies, set_add); } else if (this->policies_ == 0) { - policy_manager->set_policy_overrides (policies, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE); } else { policy_manager->copy_from (this->policies_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); - policy_manager->set_policy_overrides (policies, - set_add - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + policy_manager->set_policy_overrides (policies, set_add); } TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (), - this->base_profiles_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->base_profiles_); stub->policies_ = policy_manager.release (); @@ -532,8 +486,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, } CORBA::PolicyList * -TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types - ACE_ENV_ARG_DECL) +TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { if (this->policies_ == 0) { @@ -541,14 +494,12 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types ACE_NEW_THROW_EX (policy_list_ptr, CORBA::PolicyList (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return policy_list_ptr; } else { - return this->policies_->get_policy_overrides (types - ACE_ENV_ARG_PARAMETER); + return this->policies_->get_policy_overrides (types); } } @@ -562,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 */ @@ -603,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)); |