summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp150
1 files changed, 75 insertions, 75 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 8264d00775a..9ab03d4f1c8 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -230,10 +230,10 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
CORBA::TypeCode_var type = value.type ();
// @@ Seth, this will not work on platforms using environment variable.
- ACE_DECLARE_NEW_CORBA_ENV;
+ TAO_ENV_DECLARE_NEW_ENV;
- if (type->equal (CosTradingDynamic::_tc_DynamicProp,
- ACE_TRY_ENV))
+ if (type->equal (CosTradingDynamic::_tc_DynamicProp
+ TAO_ENV_ARG_PARAMETER))
return_value = 1;
}
@@ -241,8 +241,8 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
}
CORBA::Any*
-TAO_Property_Evaluator::property_value (int index,
- CORBA::Environment& ACE_TRY_ENV)
+TAO_Property_Evaluator::property_value (int index
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
{
CORBA::Any* prop_val = 0;
@@ -282,7 +282,7 @@ TAO_Property_Evaluator::property_value (int index,
ACE_TRY
{
// Retrieve the value of the dynamic property.
- prop_val = dp_eval->evalDP(name, type, info, ACE_TRY_ENV);
+ prop_val = dp_eval->evalDP(name, type, info TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (this->dp_cache_ != 0)
@@ -325,8 +325,8 @@ TAO_Property_Evaluator::property_type (int index)
}
TAO_Property_Evaluator_By_Name::
-TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
- CORBA::Environment& ACE_TRY_ENV,
+TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
+ TAO_ENV_ARG_DECL,
CORBA::Boolean supports_dp)
ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
CosTrading::IllegalPropertyName))
@@ -377,8 +377,8 @@ is_dynamic_property(const char* property_name)
}
CORBA::Any*
-TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
- CORBA::Environment& ACE_TRY_ENV)
+TAO_Property_Evaluator_By_Name::property_value (const char* property_name
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
{
int index = 0;
@@ -390,8 +390,8 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
if (this->table_.find (prop_name, index) == 0)
{
prop_value =
- this->TAO_Property_Evaluator::property_value (index,
- ACE_TRY_ENV);
+ this->TAO_Property_Evaluator::property_value (index
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
@@ -447,12 +447,12 @@ construct_dynamic_prop (const char* name,
if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
{
// Seth, we need a way to either propagate exceptions out.
- ACE_DECLARE_NEW_CORBA_ENV;
+ TAO_ENV_DECLARE_NEW_ENV;
- this->prop_ = this->_this (ACE_TRY_ENV);
+ this->prop_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- this->_remove_ref (ACE_TRY_ENV);
+ this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
@@ -472,17 +472,17 @@ TAO_Dynamic_Property::destroy (void)
if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
{
// @@ Seth, we need a way to propagate exceptions out.
- ACE_DECLARE_NEW_CORBA_ENV;
- PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+ TAO_ENV_DECLARE_NEW_ENV;
+ PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
PortableServer::ObjectId_var id =
- poa->servant_to_id (this,
- ACE_TRY_ENV);
+ poa->servant_to_id (this
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
- poa->deactivate_object (id.in (),
- ACE_TRY_ENV);
+ poa->deactivate_object (id.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
}
}
@@ -503,8 +503,8 @@ const char* TAO_Policies::POLICY_NAMES[] =
};
TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
- const CosTrading::PolicySeq& policies,
- CORBA::Environment& ACE_TRY_ENV)
+ const CosTrading::PolicySeq& policies
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
CosTrading::DuplicatePolicyName))
: trader_ (trader)
@@ -572,8 +572,8 @@ TAO_Policies::~TAO_Policies (void)
}
CORBA::ULong
-TAO_Policies::ulong_prop (POLICY_TYPE pol,
- CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::ulong_prop (POLICY_TYPE pol
+ TAO_ENV_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
CORBA::ULong return_value = 0, max_value = 0;
@@ -611,7 +611,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
const CosTrading::PolicyValue& value = policy->value;
CORBA::TypeCode_var type = value.type ();
- CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong, ACE_TRY_ENV);
+ CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (return_value);
if (!equal_ulong)
@@ -628,29 +628,29 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
}
CORBA::ULong
-TAO_Policies::search_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::search_card (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->ulong_prop (SEARCH_CARD, ACE_TRY_ENV);
+ return this->ulong_prop (SEARCH_CARD TAO_ENV_ARG_PARAMETER);
}
CORBA::ULong
-TAO_Policies::match_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::match_card (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->ulong_prop (MATCH_CARD, ACE_TRY_ENV);
+ return this->ulong_prop (MATCH_CARD TAO_ENV_ARG_PARAMETER);
}
CORBA::ULong
-TAO_Policies::return_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::return_card (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->ulong_prop (RETURN_CARD, ACE_TRY_ENV);
+ return this->ulong_prop (RETURN_CARD TAO_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::boolean_prop (POLICY_TYPE pol,
- CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::boolean_prop (POLICY_TYPE pol
+ TAO_ENV_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
CORBA::Boolean def_value = 1,
@@ -683,7 +683,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
CORBA::TypeCode_var type = value.type ();
CORBA::Boolean equal_boolean =
- type->equal (CORBA::_tc_boolean, ACE_TRY_ENV);
+ type->equal (CORBA::_tc_boolean TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (return_value);
if (!equal_boolean)
@@ -704,36 +704,36 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
CORBA::Boolean
-TAO_Policies::use_modifiable_properties (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, ACE_TRY_ENV);
+ return this->boolean_prop (USE_MODIFIABLE_PROPERTIES TAO_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::use_dynamic_properties (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->boolean_prop (USE_DYNAMIC_PROPERTIES, ACE_TRY_ENV);
+ return this->boolean_prop (USE_DYNAMIC_PROPERTIES TAO_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::use_proxy_offers (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->boolean_prop (USE_PROXY_OFFERS, ACE_TRY_ENV);
+ return this->boolean_prop (USE_PROXY_OFFERS TAO_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::exact_type_match (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->boolean_prop (EXACT_TYPE_MATCH, ACE_TRY_ENV);
+ return this->boolean_prop (EXACT_TYPE_MATCH TAO_ENV_ARG_PARAMETER);
}
CosTrading::TraderName*
-TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
CosTrading::Lookup::InvalidPolicyValue))
{
@@ -746,11 +746,11 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
CORBA::TypeCode_var type = value.type ();
CORBA::Boolean equal_tradername =
- type->equal (CosTrading::_tc_TraderName, ACE_TRY_ENV);
+ type->equal (CosTrading::_tc_TraderName TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (trader_name);
CORBA::Boolean equal_linknameseq =
- type->equal (CosTrading::_tc_LinkNameSeq, ACE_TRY_ENV);
+ type->equal (CosTrading::_tc_LinkNameSeq TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (trader_name);
if (!equal_tradername ||
@@ -765,7 +765,7 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
}
CosTrading::FollowOption
-TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
CosTrading::FollowOption return_value =
@@ -782,7 +782,7 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
// Extract the link follow rule
CORBA::Boolean type_equal =
- type->equal (CosTrading::_tc_FollowOption, ACE_TRY_ENV);
+ type->equal (CosTrading::_tc_FollowOption TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (return_value);
if (!type_equal)
@@ -799,8 +799,8 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
}
CosTrading::FollowOption
-TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
- CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
+ TAO_ENV_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
CosTrading::Lookup::InvalidPolicyValue,
CosTrading::Link::IllegalLinkName,
@@ -814,7 +814,7 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
// If not defined defaults to trader.def_link_follow_rule
CosTrading::FollowOption query_link_follow_rule =
- this->link_follow_rule (ACE_TRY_ENV);
+ this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (return_value);
return_value = (query_link_follow_rule < trader_max_follow_policy)
@@ -826,14 +826,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
}
CORBA::ULong
-TAO_Policies::hop_count (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::hop_count (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
- return this->ulong_prop (HOP_COUNT, ACE_TRY_ENV);
+ return this->ulong_prop (HOP_COUNT TAO_ENV_ARG_PARAMETER);
}
CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::request_id (TAO_ENV_SINGLE_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
CosTrading::Admin::OctetSeq* request_id = 0;
@@ -845,7 +845,7 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
CORBA::TypeCode_var type = value.type ();
CORBA::Boolean equal_octetseq =
- type->equal (CosTrading::Admin::_tc_OctetSeq, ACE_TRY_ENV);
+ type->equal (CosTrading::Admin::_tc_OctetSeq TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (request_id);
if (!equal_octetseq)
@@ -861,8 +861,8 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
void
TAO_Policies::
copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
- const CosTrading::Link::LinkInfo& link_info,
- CORBA::Environment& ACE_TRY_ENV) const
+ const CosTrading::Link::LinkInfo& link_info
+ TAO_ENV_ARG_DECL) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
CosTrading::Lookup::InvalidPolicyValue))
{
@@ -873,7 +873,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
if (this->policies_[LINK_FOLLOW_RULE] != 0)
{
CosTrading::FollowOption query_link_follow_rule =
- this->link_follow_rule (ACE_TRY_ENV);
+ this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
follow_option = (CosTrading::FollowOption)
@@ -943,9 +943,9 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
if (i == HOP_COUNT)
{
// @@ Seth, Same thing here, are you trying to catch the exception??? (and forget about it?)
- CORBA::Environment env;
+ TAO_ENV_DECLARE_NEW_ENV;
new_policy.name = POLICY_NAMES[HOP_COUNT];
- new_policy.value <<= this->hop_count (env) - 1;
+ new_policy.value <<= this->hop_count (TAO_ENV_SINGLE_ARG_PARAMETER) - 1;
// Don't count hop count twice.
if (this->policies_[i] == 0)
@@ -1087,8 +1087,8 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
void
TAO_Offer_Modifier::
-delete_properties (const CosTrading::PropertyNameSeq& deletes,
- CORBA::Environment& ACE_TRY_ENV)
+delete_properties (const CosTrading::PropertyNameSeq& deletes
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
CosTrading::Register::MandatoryProperty,
CosTrading::IllegalPropertyName,
@@ -1127,8 +1127,8 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes,
void
TAO_Offer_Modifier::
-merge_properties (const CosTrading::PropertySeq& modifies,
- CORBA::Environment& ACE_TRY_ENV)
+merge_properties (const CosTrading::PropertySeq& modifies
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
CosTrading::DuplicatePropertyName,
CosTrading::PropertyTypeMismatch,
@@ -1174,7 +1174,7 @@ merge_properties (const CosTrading::PropertySeq& modifies,
// seemed "safest".
CORBA::Boolean td_equal =
- type_def->equal (prop_type.in (), ACE_TRY_ENV);
+ type_def->equal (prop_type.in () TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
if (!td_equal)
@@ -1248,26 +1248,26 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
// CosTrading::PropertySeq::freebuf (prop_buf);
}
-TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies,
- CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
+ TAO_ENV_ARG_DECL)
{
- search_card_ = policies.search_card (ACE_TRY_ENV);
+ search_card_ = policies.search_card (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- match_card_ = policies.match_card (ACE_TRY_ENV);
+ match_card_ = policies.match_card (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- return_card_ = policies.return_card (ACE_TRY_ENV);
+ return_card_ = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- dp_ = policies.use_dynamic_properties (ACE_TRY_ENV);
+ dp_ = policies.use_dynamic_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- mod_ = policies.use_modifiable_properties (ACE_TRY_ENV);
+ mod_ = policies.use_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CORBA::Boolean exact_type_match =
- policies.exact_type_match (ACE_TRY_ENV);
+ policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
if (exact_type_match == 1)
@@ -1422,8 +1422,8 @@ TAO_Offer_Filter::limits_applied (void)
}
TAO_Property_Filter::
-TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
- CORBA::Environment& ACE_TRY_ENV)
+TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
CosTrading::DuplicatePropertyName))
: policy_ (desired_props._d ())
View Lorry Controller Status