diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 90b01c53853..b3bf71083c7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -14,7 +14,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Constraint_Interpreter::TAO_Constraint_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)) @@ -30,22 +29,20 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter ( ACE_NEW_THROW_EX (this->root_, TAO_Literal_Constraint ((CORBA::Boolean) 1), CORBA::NO_MEMORY ()); - ACE_CHECK; } else { if (this->build_tree (constraints) != 0) - ACE_THROW (CosTrading::IllegalConstraint (constraints)); + throw CosTrading::IllegalConstraint (constraints); if (type_checker.validate (this->root_) == -1) - ACE_THROW (CosTrading::IllegalConstraint (constraints)); + throw CosTrading::IllegalConstraint (constraints); } } TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, - const char* constraints - ACE_ENV_ARG_DECL) + const char* constraints) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)) { @@ -54,15 +51,14 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, ACE_NEW_THROW_EX (this->root_, TAO_Literal_Constraint ((CORBA::Boolean) 1), CORBA::NO_MEMORY ()); - ACE_CHECK; } else { if (this->build_tree (constraints) != 0) - ACE_THROW (CosTrading::IllegalConstraint (constraints)); + throw CosTrading::IllegalConstraint (constraints); if (validator.validate (this->root_) == -1) - ACE_THROW (CosTrading::IllegalConstraint (constraints)); + throw CosTrading::IllegalConstraint (constraints); } } @@ -86,7 +82,6 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator) TAO_Preference_Interpreter::TAO_Preference_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* preference - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)) @@ -99,22 +94,20 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter ( ACE_NEW_THROW_EX (this->root_, TAO_Noop_Constraint (TAO_FIRST), CORBA::NO_MEMORY ()); - ACE_CHECK; } else { if (this->build_tree (preference) != 0) - ACE_THROW (CosTrading::Lookup::IllegalPreference (preference)); + throw CosTrading::Lookup::IllegalPreference (preference); if (type_checker.validate (this->root_) == -1) - ACE_THROW (CosTrading::Lookup::IllegalPreference (preference)); + throw CosTrading::Lookup::IllegalPreference (preference); } } TAO_Preference_Interpreter:: TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, - const char* preference - ACE_ENV_ARG_DECL) + const char* preference) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)) : TAO_Interpreter () @@ -124,15 +117,14 @@ TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, ACE_NEW_THROW_EX (this->root_, TAO_Noop_Constraint (TAO_FIRST), CORBA::NO_MEMORY ()); - ACE_CHECK; } else { if (this->build_tree (preference) != 0) - ACE_THROW (CosTrading::Lookup::IllegalPreference (preference)); + throw CosTrading::Lookup::IllegalPreference (preference); if (validator.validate (this->root_) == -1) - ACE_THROW (CosTrading::Lookup::IllegalPreference (preference)); + throw CosTrading::Lookup::IllegalPreference (preference); } } |