diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-15 16:09:09 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-15 16:09:09 +0000 |
| commit | 2db518c8522c00ecda4c6985c67f539a223cbd39 (patch) | |
| tree | 426570f53246704def015387ba57aab3d383646c /TAO/orbsvcs | |
| parent | 4df53d6a9198cdcfe61a20f4597682f534288801 (diff) | |
| download | ATCD-2db518c8522c00ecda4c6985c67f539a223cbd39.tar.gz | |
ChangeLogTag:Tue Jun 15 11:06:13 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs')
22 files changed, 315 insertions, 296 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp index 4ba5a48d163..b25240072d0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp @@ -252,18 +252,21 @@ CosEC_ServantBase::deactivate_cosec (CORBA::Environment &ACE_TRY_ENV) CosEventChannelAdmin::ConsumerAdmin_ptr CosEC_ServantBase::for_consumers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->cosec_->for_consumers (ACE_TRY_ENV); } CosEventChannelAdmin::SupplierAdmin_ptr CosEC_ServantBase::for_suppliers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->cosec_->for_suppliers (ACE_TRY_ENV); } void CosEC_ServantBase::destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate all the contained servants and ourselves. // The poa will "destroy" the ref counted servants. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h index cb4c03d0fc9..ab6b716bba3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h @@ -71,11 +71,14 @@ class TAO_ORBSVCS_Export CosEC_ServantBase : // Deactivates the CosEC and friends with the POA. // = POA_CosEventChannelAdmin::EventChannel methods. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV); - - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV); - - virtual void destroy (CORBA::Environment &ACE_TRY_ENV); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys this Event Channel object. protected: diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp index 888f886cf00..0026482f5bc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp @@ -30,6 +30,7 @@ Logger_Factory_i::~Logger_Factory_i (void) Logger_ptr Logger_Factory_i::make_logger (const char *name, CORBA::Environment &TAO_IN_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { Logger_i *result; // If name is already in the map, <find> will assign <result> to the @@ -122,6 +123,7 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level) void Logger_i::log (const Logger::Log_Record &log_rec, CORBA::Environment &TAO_IN_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity_level_, TAO_IN_ENV); } @@ -129,6 +131,7 @@ Logger_i::log (const Logger::Log_Record &log_rec, void Logger_i::log2 (const Logger::Log_Record &log_rec, CORBA::Environment &TAO_IN_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity_level_, TAO_IN_ENV); } @@ -137,6 +140,7 @@ void Logger_i::logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, CORBA::Environment &TAO_IN_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity, TAO_IN_ENV); } @@ -145,6 +149,7 @@ void Logger_i::logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Create an <ACE_Log_Record> to leverage existing logging // code. Since Logger::Log_Priority enum tags don't cleanly map to @@ -198,10 +203,11 @@ Logger_i::verbosity (void) const } void -Logger_i::verbosity (Logger::Verbosity_Level level, CORBA::Environment &env) +Logger_i::verbosity (Logger::Verbosity_Level level, + CORBA::Environment &) + ACE_THROW_SPEC (()) { - ACE_UNUSED_ARG (env); - verbosity_level_ = level; + this->verbosity_level_ = level; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h index 2eee486d438..816ef1f7120 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h @@ -34,29 +34,34 @@ public: // destructor virtual void log (const Logger::Log_Record &log_rec, - CORBA::Environment &_env); + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output. virtual void logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, - CORBA::Environment &_env); + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output with the given // verbosity level virtual void log2 (const Logger::Log_Record &log_rec, - CORBA::Environment &_env); + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output. virtual void logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, - CORBA::Environment &_env); + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output with the given // verbosity level Logger::Verbosity_Level verbosity (void) const; // Gets the verbosity level - void verbosity (Logger::Verbosity_Level level, CORBA::Environment &env); + void verbosity (Logger::Verbosity_Level level, CORBA::Environment &env) + ACE_THROW_SPEC (()); // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE // and SILENT}. Defaults to VERBOSE @@ -91,7 +96,7 @@ public: virtual Logger_ptr make_logger (const char *name, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // This function returns a logger with name <name>. If <name> is // unique, a new logger is created; else, a previously created // logger of name <name> is returned diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 6c29d3f4c9c..75de50ad531 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -79,7 +79,7 @@ TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalConstraint)) + ACE_THROW_SPEC ((CosTrading::IllegalConstraint)) : TAO_Interpreter () { TAO_Constraint_Validator type_checker (ts); @@ -100,7 +100,7 @@ TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter(TAO_Constraint_Validator& validator, const char* constraints, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalConstraint)) + ACE_THROW_SPEC ((CosTrading::IllegalConstraint)) { if (TAO_Interpreter::is_empty_string (constraints)) this->root_ = new TAO_Literal_Constraint ((CORBA::Boolean) 1); @@ -139,7 +139,7 @@ TAO_Preference_Interpreter:: TAO_Preference_Interpreter(const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* preference, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)) + ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)) : TAO_Interpreter () { TAO_Constraint_Validator type_checker (ts); @@ -160,7 +160,7 @@ TAO_Preference_Interpreter:: TAO_Preference_Interpreter(TAO_Constraint_Validator& validator, const char* preference, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)) + ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)) : TAO_Interpreter () { if (TAO_Interpreter::is_empty_string (preference)) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 26a1fb12b91..462e91ae51b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -76,12 +76,12 @@ public: TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::IllegalConstraint)); + ACE_THROW_SPEC ((CosTrading::IllegalConstraint)); TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, const char* constraints, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::IllegalConstraint)); + ACE_THROW_SPEC ((CosTrading::IllegalConstraint)); // This constructor builds an expression tree representing the // constraint specified in <constraints>, and throws an Illegal // Constraint exception if the constraint given has syntax errors or @@ -121,12 +121,12 @@ public: TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* preference, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)); + ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)); TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, const char* preference, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)); + ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference)); // Parse the preference string, determining first if it's // valid. Throw an IllegalPreference exception if the preference diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 4aa178f59ac..c8bb93f31ce 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -145,7 +145,7 @@ template <class LOCK_TYPE> int TAO_Offer_Database<LOCK_TYPE>:: remove_offer (const CosTrading::OfferId offer_id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId, + ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { char* stype = 0; @@ -165,7 +165,7 @@ TAO_Offer_Database<LOCK_TYPE>:: lookup_offer (const CosTrading::OfferId offer_id, char*& type_name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId, + ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { CORBA::ULong index; @@ -184,7 +184,7 @@ template <class LOCK_TYPE> CosTrading::Offer* TAO_Offer_Database<LOCK_TYPE>:: lookup_offer (const CosTrading::OfferId offer_id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId, + ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { char* type_name; @@ -264,7 +264,7 @@ parse_offer_id (const CosTrading::OfferId offer_id, char*&service_type, CORBA::ULong& id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId)) + ACE_THROW_SPEC ((CosTrading::IllegalOfferId)) { // Get service type: it is everything from 17th character to the end. service_type = (char *) offer_id + 16; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index 653d6d553bf..7edebd44946 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -65,12 +65,12 @@ public: int remove_offer (const CosTrading::OfferId offer_id, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId, + ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId, + ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); // Lookup an offer whose offer_id is <offer_id>, and return // it. Otherwise, throw the appropriate exception. @@ -78,7 +78,7 @@ public: CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, char*& type_name, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId, + ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); // Lookup an offer whose OfferId is <offer_id> and return in // <type_name> the type name of the object. Type name is just a @@ -131,7 +131,7 @@ private: char* &service_type, CORBA::ULong& id, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalOfferId)); + ACE_THROW_SPEC ((CosTrading::IllegalOfferId)); // Take in a previously generated offer id and return the type // and id that were used to generate the offer id. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 0c5357eacb9..670a6d28e1b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -1,16 +1,16 @@ // ======================================================================== // $Id$ -// +// // = LIBRARY // orbsvcs -// +// // = FILENAME // Offer_Iterators.cpp // // = AUTHOR // Marina Spivak <marina@cs.wustl.edu> // Seth Widoff <sbw1@cs.wustl.edu> -// +// // ======================================================================== #include "Offer_Iterators.h" @@ -30,16 +30,16 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void) { } -void +void TAO_Offer_Iterator::destroy (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA // // Note that there is no real error checking here as we can't do // much about errors here anyway // - + TAO_TRY { PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV); @@ -47,12 +47,12 @@ TAO_Offer_Iterator::destroy (CORBA::Environment &) PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV); TAO_CHECK_ENV; - + poa->deactivate_object (id.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + TAO_CHECK_ENV; } TAO_CATCHANY - { + { } TAO_ENDTRY; } @@ -60,7 +60,7 @@ TAO_Offer_Iterator::destroy (CORBA::Environment &) // ************************************************************* // TAO_Query_Only_Offer_Iterator // ************************************************************* - + TAO_Query_Only_Offer_Iterator:: TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter) : TAO_Offer_Iterator (pfilter) @@ -73,32 +73,32 @@ TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator(void) void TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id, - const CosTrading::Offer* offer) + const CosTrading::Offer* offer) { this->offers_.enqueue_tail ((CosTrading::Offer*) offer); CORBA::string_free (offer_id); } -CORBA::ULong -TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &) - TAO_THROW_SPEC((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) +CORBA::ULong +TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &) + ACE_THROW_SPEC((CORBA::SystemException, + CosTrading::UnknownMaxLeft)) { return this->offers_.size (); } -CORBA::Boolean -TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, +CORBA::Boolean +TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers, - CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)) + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { offers = new CosTrading::OfferSeq; CORBA::ULong sequence_size = this->offers_.size (); CORBA::ULong offers_in_sequence = (n < sequence_size) ? n : sequence_size; offers->length (offers_in_sequence); - + // populate the sequence. for (CORBA::ULong i = 0; i < offers_in_sequence; i++) { @@ -107,7 +107,7 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, this->offers_.dequeue_head (source); this->pfilter_.filter_offer (source, offers[i]); } - + return offers_in_sequence != 0; } @@ -130,7 +130,7 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void) { offer_iter->destroy (TAO_TRY_ENV); TAO_CHECK_ENV; - + CORBA::release (offer_iter); } TAO_CATCHANY {} @@ -148,14 +148,14 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter) CORBA::Boolean TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment &env) - TAO_THROW_SPEC ((CORBA::SystemException)) + CosTrading::OfferSeq_out offers, + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong offers_left = n; CORBA::Boolean return_value = 1; CosTrading::OfferSeq_var out_offers; - + ACE_NEW_RETURN (offers, CosTrading::OfferSeq, return_value); while (offers_left > 0 && ! this->iters_.is_empty ()) { @@ -165,7 +165,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, this->iters_.dequeue_head (iter); // Determine how many offers we should retrieve from this - // iterator. + // iterator. TAO_TRY { @@ -190,8 +190,8 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, offers->length (out_offers->length () + offset); for (int j = out_offers->length () - 1; j >= 0; j--) offers[j + offset] = out_offers[j]; - - offers_left -= out_offers->length (); + + offers_left -= out_offers->length (); } TAO_CATCHANY { @@ -207,8 +207,8 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, } void -TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) +TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy all iterators in the collection. for (Offer_Iters::ITERATOR iters_iter (this->iters_); @@ -226,27 +226,27 @@ TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV) // Note that there is no real error checking here as we can't do // much about errors here anyway // - + TAO_TRY { PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV); TAO_CHECK_ENV; PortableServer::ObjectId_var id = - poa->servant_to_id (this, TAO_TRY_ENV); + poa->servant_to_id (this, TAO_TRY_ENV); TAO_CHECK_ENV; - + poa->deactivate_object (id.in (), TAO_TRY_ENV); } TAO_CATCHANY - { + { } TAO_ENDTRY; } CORBA::ULong TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) + ACE_THROW_SPEC ((CORBA::SystemException, + CosTrading::UnknownMaxLeft)) { TAO_THROW_RETURN (CosTrading::UnknownMaxLeft(), 0); } @@ -267,45 +267,45 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) do { CosTrading::OfferId offer_id = 0; - + return_value = this->ids_.dequeue_head (offer_id); if (return_value == 0) - CORBA::string_free (offer_id); + CORBA::string_free (offer_id); } while (return_value == 0); } CORBA::ULong TAO_Offer_Id_Iterator::max_left (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) + ACE_THROW_SPEC ((CORBA::SystemException, + CosTrading::UnknownMaxLeft)) { return this->ids_.size (); } void TAO_Offer_Id_Iterator::destroy (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA // // Note that there is no real error checking here as we can't do // much about errors here anyway // - + TAO_TRY { PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV); TAO_CHECK_ENV; - + PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV); TAO_CHECK_ENV; - + poa->deactivate_object (id.in (), TAO_TRY_ENV); TAO_CHECK_ENV; } TAO_CATCHANY - { + { } TAO_ENDTRY; } @@ -314,14 +314,14 @@ CORBA::Boolean TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, CosTrading::OfferIdSeq_out _ids, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Calculate the number of Ids to be returned in this. int items_left = this->ids_.size(), difference = items_left - n, returnable_items = (difference >= 0) ? n : items_left; CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0); - + if (returnable_items == 0) { ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value); @@ -333,7 +333,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, CosTrading::OfferIdSeq::allocbuf (returnable_items); if (id_buf != 0) - { + { // Copy in those ids! for (int i = 0; i < returnable_items; i++) { @@ -342,7 +342,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, this->ids_.dequeue_head (offer_id); id_buf[i] = offer_id; } - + // Place them into an OfferIdSeq. ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq (returnable_items, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 5bf84a97100..c5cd1c2448d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -49,7 +49,7 @@ public: virtual ~TAO_Offer_Iterator (void); virtual void destroy (CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC // The destroy operation destroys the iterator. No further // operations can be invoked on an iterator after it has been @@ -62,7 +62,7 @@ public: // iterate over. virtual CORBA::ULong max_left (CORBA::Environment &env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) = 0; // BEGIN SPEC @@ -76,7 +76,7 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers, CORBA::Environment &env) - TAO_THROW_SPEC ((CORBA::SystemException)) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // BEGIN SPEC // The next_n operation returns a set of service offers in the // output parameter "offers." The operation returns n service offers @@ -128,12 +128,12 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Deposit at maximum n offers into the return sequence and return 1, // or return 0 if the iterator is done and no offers are returned. virtual CORBA::ULong max_left (CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Return the number of items left in the iterator. @@ -184,15 +184,15 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers, CORBA::Environment &env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Retrieve n offers from the set of iterators. virtual void destroy (CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the collection of iterators. virtual CORBA::ULong max_left (CORBA::Environment &env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Determine how many offers are left in the collection. @@ -239,7 +239,7 @@ class TAO_Offer_Id_Iterator : ~TAO_Offer_Id_Iterator (void); virtual CORBA::ULong max_left(CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // The max_left operation returns the number of offer identifiers // remaining in the iterator. The exception UnknownMaxLeft is raised @@ -248,7 +248,7 @@ class TAO_Offer_Id_Iterator : // identifiers through lazy evaluation). virtual void destroy(CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // The destroy operation destroys the iterator. No further // operations can be invoked on an iterator after it has been // destroyed. @@ -256,7 +256,7 @@ class TAO_Offer_Id_Iterator : virtual CORBA::Boolean next_n(CORBA::ULong _n, CosTrading::OfferIdSeq_out _ids, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // The next_n operation returns a set of offer identifiers in the // output parameter "ids." The operation returns n offer identifiers // if there are at least n offer identifiers remaining in the diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index 7c6a5cd6daa..2a501a94c7b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -53,7 +53,7 @@ add_offer (CosTrading::OfferId id, template <class MAP_LOCK_TYPE> CORBA::ULong TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: max_left (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { return this->offer_ids_.size (); @@ -64,7 +64,7 @@ TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong ret_offers = 0; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index beae59855fd..1af30631650 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -47,12 +47,12 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Deposit at maximum n offers into the return sequence and return 1, // or return 0 if the iterator is done and no offers are returned. virtual CORBA::ULong max_left (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Throws CosTrading::UnknownMaxLeft since with the presence of // "Register" functionality, the iterator cannot guarantee that diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index be883ab595b..a9386747480 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -54,6 +54,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) CosTradingRepos::ServiceTypeRepository::IncarnationNumber TAO_Service_Type_Repository::incarnation (CORBA::Environment &) + ACE_THROW_SPEC (()) { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; if (this->lock_->acquire_read () == -1) @@ -78,7 +79,7 @@ add_type (const char * name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, @@ -160,7 +161,7 @@ add_type (const char * name, void TAO_Service_Type_Repository::remove_type (const char * name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::HasSubTypes)) @@ -189,7 +190,7 @@ CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq* TAO_Service_Type_Repository:: list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_READ_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -226,7 +227,7 @@ CosTradingRepos::ServiceTypeRepository::TypeStruct* TAO_Service_Type_Repository:: describe_type (const char * name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) { @@ -273,7 +274,7 @@ CosTradingRepos::ServiceTypeRepository::TypeStruct* TAO_Service_Type_Repository:: fully_describe_type (const char * name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) { @@ -312,7 +313,7 @@ void TAO_Service_Type_Repository:: mask_type (const char * name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::AlreadyMasked)) @@ -342,7 +343,7 @@ void TAO_Service_Type_Repository:: unmask_type (const char * name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::NotMasked)) @@ -457,7 +458,7 @@ TAO_Service_Type_Repository:: validate_properties (Prop_Map& prop_map, const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) { for (CORBA::ULong i = 0; i < props.length (); i++) @@ -482,7 +483,7 @@ TAO_Service_Type_Repository:: validate_supertypes (Service_Type_Map& super_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalServiceType, + ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::DuplicatePropertyName)) { @@ -513,7 +514,7 @@ TAO_Service_Type_Repository:: validate_inheritance (Prop_Map& prop_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) + ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) { CORBA::ULong num_super_types = super_types.length (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index ee482f6a643..ebb9b61f7f4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -35,7 +35,8 @@ public: ~TAO_Service_Type_Repository (void); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - incarnation (CORBA::Environment &_env); + incarnation (CORBA::Environment &_env) + ACE_THROW_SPEC (()); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber add_type (const char *name, @@ -43,7 +44,7 @@ public: const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, @@ -97,7 +98,7 @@ public: virtual void remove_type (const char *name, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::HasSubTypes)); @@ -113,7 +114,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC // The list_types operation permits a client to obtain the names of @@ -129,7 +130,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * describe_type (const char *name, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); // BEGIN SPEC @@ -143,7 +144,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * fully_describe_type (const char *name, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); // BEGIN SPEC @@ -160,7 +161,7 @@ public: virtual void mask_type (const char *name, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::AlreadyMasked)); @@ -179,7 +180,7 @@ public: virtual void unmask_type (const char *name, CORBA::Environment &_env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::NotMasked)); @@ -242,7 +243,7 @@ public: void validate_properties (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, CORBA::Environment &_env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // Confirm that the properties in props have valid names, and aren't // duplicated. Cram those properties into the prop_map. @@ -250,7 +251,7 @@ public: void validate_supertypes (Service_Type_Map &super_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, CORBA::Environment &_env) - TAO_THROW_SPEC ((CosTrading::IllegalServiceType, + ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::DuplicatePropertyName)); // Confirm that the each super type exists, and cram them into super_map. @@ -258,14 +259,14 @@ public: void validate_inheritance (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, CORBA::Environment &_env) - TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); + ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); // Ensure that properties of a super_type aren't having their types // or retstrictions redefined. // void validate_interface (const char *if_name, // Service_Type_Map &super_map, // CORBA::Environment &_env) - // TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch)); + // ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch)); // Ensure that the interface type derives from its superclasses'. void update_type_map (const char *name, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 63f438059fd..5c857ff1a1e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -868,7 +868,7 @@ CORBA::TCKind TAO_Sequence_Extracter_Base:: sequence_type (CORBA::TypeCode* type_code, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TCKind return_value = CORBA::tk_void, type_kind = type_code->kind (env); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index f3f04c54948..48ee2779794 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -513,7 +513,7 @@ public: static CORBA::TCKind sequence_type (CORBA::TypeCode* code, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Return the sequence element type for the sequence whose typecode // is <code>. }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 8ac7f2f8d2a..d4fe3eaf7fe 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -63,7 +63,7 @@ query (const char *type, CosTrading::OfferIterator_out returned_offer_iterator, CosTrading::PolicyNameSeq_out returned_limits_applied, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -372,7 +372,7 @@ fill_receptacles (const char* type, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) { // BEGIN SPEC @@ -503,7 +503,7 @@ retrieve_links (TAO_Policies& policies, CORBA::ULong offers_returned, CosTrading::LinkNameSeq_out links, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean should_follow = 0; @@ -581,7 +581,7 @@ federated_query (const CosTrading::LinkNameSeq& links, CosTrading::OfferIterator_ptr& offer_iter, CosTrading::PolicyNameSeq& limits, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -745,7 +745,7 @@ forward_query (const char* next_hop, CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -823,7 +823,7 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: seen_request_id (TAO_Policies& policies, CosTrading::Admin::OctetSeq*& seq, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean return_value = 0; @@ -904,7 +904,7 @@ _cxx_export (CORBA::Object_ptr reference, const char *type, const CosTrading::PropertySeq &properties, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -978,7 +978,7 @@ void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw (const char *id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Register::ProxyOfferId)) @@ -993,7 +993,7 @@ CosTrading::Register::OfferInfo * TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: describe (const char *id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Register::ProxyOfferId)) @@ -1028,7 +1028,7 @@ modify (const char *id, const CosTrading::PropertyNameSeq& del_list, const CosTrading::PropertySeq& modify_list, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -1085,7 +1085,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_using_constraint (const char *type, const char *constr, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -1156,7 +1156,7 @@ CosTrading::Register_ptr TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: resolve (const CosTrading::TraderName &name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::IllegalTraderName, CosTrading::Register::UnknownTraderName, CosTrading::Register::RegisterNotSupported)) @@ -1222,7 +1222,7 @@ validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, const CosTrading::PropertySeq& properties, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, CosTrading::MissingMandatoryProperty, @@ -1337,7 +1337,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq * TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0); @@ -1360,7 +1360,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_search_card (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_search_card (); @@ -1374,7 +1374,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_search_card (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_search_card (); @@ -1388,7 +1388,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_match_card (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_match_card (); @@ -1402,7 +1402,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_match_card (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_match_card (); @@ -1416,7 +1416,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_return_card (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_return_card (); @@ -1430,7 +1430,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_return_card (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_return_card (); @@ -1444,7 +1444,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_list (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_list (); @@ -1458,7 +1458,7 @@ CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_supports_modifiable_properties (CORBA::Boolean value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = this->trader_.support_attributes ().supports_modifiable_properties (); @@ -1472,7 +1472,7 @@ CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_supports_dynamic_properties (CORBA::Boolean value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = this->trader_.support_attributes ().supports_dynamic_properties (); @@ -1486,7 +1486,7 @@ CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_supports_proxy_offers (CORBA::Boolean value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = this->trader_.support_attributes ().supports_proxy_offers (); @@ -1500,7 +1500,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_hop_count (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_hop_count (); @@ -1514,7 +1514,7 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_hop_count (CORBA::ULong value, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_hop_count (); @@ -1528,7 +1528,7 @@ CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_follow_policy (CosTrading::FollowOption policy, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = this->trader_.import_attributes ().def_follow_policy (); @@ -1542,7 +1542,7 @@ CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_follow_policy (CosTrading::FollowOption policy, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = this->trader_.import_attributes ().max_follow_policy (); @@ -1556,7 +1556,7 @@ CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_link_follow_policy (CosTrading::FollowOption policy, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = this->trader_.link_attributes ().max_link_follow_policy (); @@ -1570,7 +1570,7 @@ CosTrading::TypeRepository_ptr TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_type_repos (CosTrading::TypeRepository_ptr repository, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::TypeRepository_ptr return_value = this->trader_.support_attributes ().type_repos (); @@ -1584,7 +1584,7 @@ CosTrading::Admin::OctetSeq* TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_request_id_stem (const CosTrading::Admin::OctetSeq& stem, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, &this->stem_id_); this->stem_id_ = stem; @@ -1598,7 +1598,7 @@ list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, CosTrading::OfferIdIterator_out id_itr, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { // This method only applies when the register interface is implemented if (CORBA::is_nil (this->trader_.trading_components().register_if())) @@ -1630,7 +1630,7 @@ list_proxies (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, CosTrading::OfferIdIterator_out id_itr, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { TAO_THROW (CosTrading::NotImplemented ()); @@ -1662,7 +1662,7 @@ add_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::DuplicateLinkName, CosTrading::InvalidLookupRef, @@ -1712,7 +1712,7 @@ void TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: remove_link (const char *name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)) { @@ -1733,7 +1733,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Link::LinkInfo * TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)) { @@ -1772,7 +1772,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::LinkNameSeq* TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate space for the link names. CORBA::ULong size = this->links_.current_size (), i = 0; @@ -1796,7 +1796,7 @@ modify_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName, + ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName, CosTrading::Link::DefaultFollowTooPermissive, CosTrading::Link::LimitingFollowTooPermissive)) @@ -1857,7 +1857,7 @@ export_proxy (CosTrading::Lookup_ptr target, const char * recipe, const CosTrading::PolicySeq& policies_to_pass_on, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::InvalidLookupRef, @@ -1877,7 +1877,7 @@ void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_proxy (const char *id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)) @@ -1890,7 +1890,7 @@ CosTrading::Proxy::ProxyInfo * TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: describe_proxy (const char *id, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)) @@ -1905,7 +1905,7 @@ list_proxies (CORBA::ULong how_many, CosTrading::OfferIdSeq*& ids, CosTrading::OfferIdIterator_ptr& id_itr, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { TAO_THROW (CORBA::UNKNOWN ()); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 6faa9fbc600..00561a27cf0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -68,7 +68,7 @@ public: CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -191,7 +191,7 @@ private: CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // This method takes the list of ordered offers and places a number // of them in the sequence of returned offers and the rest into thr @@ -210,7 +210,7 @@ private: CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -228,7 +228,7 @@ private: CORBA::ULong offer_returned, CosTrading::LinkNameSeq_out links, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); // Assemble a sequence of links that the federate_query method // should follow. Use the starting_trader policy, if one's provided, @@ -248,7 +248,7 @@ private: CosTrading::OfferIterator_ptr& offer_itr, CosTrading::PolicyNameSeq& limits_applied, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -270,7 +270,7 @@ private: CORBA::Boolean seen_request_id (TAO_Policies& policies, CosTrading::Admin::OctetSeq*& seq, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); // = Disallow these operations. @@ -314,7 +314,7 @@ public: const char *type, const CosTrading::PropertySeq& properties, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -380,7 +380,7 @@ public: // END SPEC virtual void withdraw (const char *id, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Register::ProxyOfferId)); @@ -401,7 +401,7 @@ public: virtual CosTrading::Register::OfferInfo* describe (const char * id, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Register::ProxyOfferId)); @@ -424,7 +424,7 @@ public: const CosTrading::PropertyNameSeq& del_list, const CosTrading::PropertySeq& modify_list, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -493,7 +493,7 @@ public: virtual void withdraw_using_constraint (const char *type, const char *constr, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::IllegalConstraint, @@ -525,7 +525,7 @@ public: virtual CosTrading::Register_ptr resolve (const CosTrading::TraderName &name, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::IllegalTraderName, CosTrading::Register::UnknownTraderName, CosTrading::Register::RegisterNotSupported)); @@ -559,7 +559,7 @@ public: const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, const CosTrading::PropertySeq& properties, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, CosTrading::MissingMandatoryProperty, @@ -615,47 +615,47 @@ public: virtual CORBA::ULong set_def_search_card (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_search_card (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // search card is the cardinality of the offers searched for // constraint compliance. virtual CORBA::ULong set_def_match_card (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_match_card (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // match card is the cardinality of offers found compliant with the // constraints. virtual CORBA::ULong set_def_return_card (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_return_card (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // return card is the cardinality of the offers returned from // Lookup. virtual CORBA::ULong set_max_list (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_modifiable_properties (CORBA::Boolean value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_dynamic_properties (CORBA::Boolean value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_proxy_offers (CORBA::Boolean value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Types of offers available for consideration. Ween out those // offers with modifiable properties @@ -663,45 +663,45 @@ public: virtual CORBA::ULong set_def_hop_count (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_hop_count (CORBA::ULong value, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_def_follow_policy (CosTrading::FollowOption policy, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_max_follow_policy (CosTrading::FollowOption policy, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_max_link_follow_policy (CosTrading::FollowOption policy, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // = Set Type Repository virtual CosTrading::TypeRepository_ptr set_type_repos (CosTrading::TypeRepository_ptr repository, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* request_id_stem (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* set_request_id_stem (const CosTrading::Admin::OctetSeq& stem, CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual void list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, CosTrading::OfferIdIterator_out id_itr, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); @@ -727,7 +727,7 @@ public: CosTrading::OfferIdSeq_out, CosTrading::OfferIdIterator_out, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); private: @@ -768,7 +768,7 @@ public: CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::DuplicateLinkName, CosTrading::InvalidLookupRef, @@ -817,7 +817,7 @@ public: virtual void remove_link (const char *name, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); @@ -834,7 +834,7 @@ public: virtual CosTrading::Link::LinkInfo* describe_link (const char *name, CORBA::Environment&) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); @@ -862,7 +862,7 @@ public: // END SPEC virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC // The list_links operation returns a list of the names of all @@ -875,7 +875,7 @@ public: CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName, + ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName, CosTrading::Link::DefaultFollowTooPermissive, CosTrading::Link::LimitingFollowTooPermissive)); @@ -949,7 +949,7 @@ public: const char *, const CosTrading::PolicySeq &, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::InvalidLookupRef, @@ -963,7 +963,7 @@ public: virtual void withdraw_proxy (const char *, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)); @@ -971,7 +971,7 @@ public: virtual CosTrading::Proxy::ProxyInfo * describe_proxy (const char *, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)); @@ -982,7 +982,7 @@ public: CosTrading::OfferIdSeq *&, CosTrading::OfferIdIterator_ptr &, CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); private: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index cdebf4d772f..962fb11863a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -136,35 +136,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps) template <class IF> CosTrading::Lookup_ptr TAO_Trader_Components<IF>::lookup_if (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ()); } template <class IF> CosTrading::Register_ptr TAO_Trader_Components<IF>::register_if (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Register::_duplicate (this->comps_.register_if ()); } template <class IF> CosTrading::Admin_ptr TAO_Trader_Components<IF>::admin_if (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Admin::_duplicate (this->comps_.admin_if ()); } template <class IF> CosTrading::Proxy_ptr TAO_Trader_Components<IF>::proxy_if (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ()); } template <class IF> CosTrading::Link_ptr TAO_Trader_Components<IF>::link_if (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Link::_duplicate (this->comps_.link_if ()); } @@ -177,28 +177,28 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs) template <class IF> CORBA::Boolean TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_modifiable_properties (); } template <class IF> CORBA::Boolean TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_dynamic_properties (); } template <class IF> CORBA::Boolean TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_proxy_offers (); } template <class IF> CosTrading::TypeRepository_ptr TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ()); } @@ -212,77 +212,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs) template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_search_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_search_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_match_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_match_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_return_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_return_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_list (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_list (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_hop_count (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_hop_count (); } template <class IF> CosTrading::FollowOption TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_follow_policy (); } template <class IF> CosTrading::FollowOption TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_follow_policy (); } @@ -296,7 +296,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs) template <class IF> CosTrading::FollowOption TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &env) - TAO_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_link_follow_policy (); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index d91fc18542a..ca513621416 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -104,27 +104,27 @@ public: // = CosTrading::TraderComponents methods. virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Returns an object reference to the Lookup interface of the trader. // Returns nil if the trader does not support Lookup interface. virtual CosTrading::Register_ptr register_if (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Register interface of the trader. // Returns nil if the trader does not support Register interface. virtual CosTrading::Link_ptr link_if (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Link interface of the trader. // Returns nil if the trader does not support Link interface. virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference to the Proxy interface of the trader. // Returns nil if the trader does not support Proxy interface. virtual CosTrading::Admin_ptr admin_if (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Admin interface of the trader. // Returns nil if the trader does not support Admin interface. @@ -143,16 +143,16 @@ public: // = CosTrading::SupportAttributes methods. virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -169,47 +169,47 @@ public: // = CosTrading::ImportAttributes methods. virtual CORBA::ULong def_search_card (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong max_search_card (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Search cardinality determines the maximum number of offers searched // before not considering other offers. virtual CORBA::ULong def_match_card (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong max_match_card (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Match cardinality determines the maximum number of offers // matched to the constraints before not considering other offers.. virtual CORBA::ULong def_return_card (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong max_return_card (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Return cardinality determines the maximum number of offers marked // to return before not considering other offers. virtual CORBA::ULong max_list (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong def_hop_count (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong max_hop_count (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption def_follow_policy (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -226,7 +226,7 @@ public: // = CosTrading::LinkAttributes methods virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &) - TAO_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 04899637bdf..fe50b9767f8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -253,7 +253,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index) CORBA::Any* TAO_Property_Evaluator::property_value (int index, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) + ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { CORBA::Any* prop_val = 0; CORBA::Boolean in_cache = @@ -342,7 +342,7 @@ TAO_Property_Evaluator_By_Name:: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties, CORBA::Environment& TAO_IN_ENV, CORBA::Boolean supports_dp) - TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName, + ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, CosTrading::IllegalPropertyName)) : TAO_Property_Evaluator (properties, supports_dp) { @@ -393,7 +393,7 @@ is_dynamic_property(const char* property_name) CORBA::Any* TAO_Property_Evaluator_By_Name::property_value (const char* property_name, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) + ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { int index = 0; CORBA::Any* prop_value = 0; @@ -465,11 +465,11 @@ construct_dynamic_prop (const char* name, this->_remove_ref (TAO_TRY_ENV); TAO_CHECK_ENV; } - + dp_struct->eval_if = CosTradingDynamic::DynamicPropEval::_duplicate (this->prop_.in ()); TAO_CHECK_ENV; - + dp_struct->returned_type = CORBA::TypeCode::_duplicate (returned_type); dp_struct->extra_info = extra_info; } @@ -491,11 +491,11 @@ TAO_Dynamic_Property::destroy (void) { PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV); TAO_CHECK_ENV; - + PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV); TAO_CHECK_ENV; - + poa->deactivate_object (id.in (), TAO_TRY_ENV); TAO_CHECK_ENV; } @@ -503,7 +503,7 @@ TAO_Dynamic_Property::destroy (void) TAO_CATCHANY { } - TAO_ENDTRY; + TAO_ENDTRY; } // ************************************************************* @@ -528,7 +528,7 @@ const char* TAO_Policies::POLICY_NAMES[] = TAO_Policies::TAO_Policies (TAO_Trader_Base& trader, const CosTrading::PolicySeq& policies, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, + ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, CosTrading::DuplicatePolicyName)) : trader_ (trader) { @@ -600,7 +600,7 @@ TAO_Policies::~TAO_Policies (void) CORBA::ULong TAO_Policies::ulong_prop (POLICY_TYPE pol, CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::ULong return_value = 0, max_value = 0; const TAO_Import_Attributes_i& import_attrs = @@ -652,21 +652,21 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol, CORBA::ULong TAO_Policies::search_card (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (SEARCH_CARD, TAO_IN_ENV); } CORBA::ULong TAO_Policies::match_card (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (MATCH_CARD, TAO_IN_ENV); } CORBA::ULong TAO_Policies::return_card (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (RETURN_CARD, TAO_IN_ENV); } @@ -674,7 +674,7 @@ TAO_Policies::return_card (CORBA::Environment& TAO_IN_ENV) const CORBA::Boolean TAO_Policies::boolean_prop (POLICY_TYPE pol, CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean def_value = 1, return_value = 1; @@ -724,28 +724,28 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol, CORBA::Boolean TAO_Policies::use_modifiable_properties (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, TAO_IN_ENV); } CORBA::Boolean TAO_Policies::use_dynamic_properties (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (USE_DYNAMIC_PROPERTIES, TAO_IN_ENV); } CORBA::Boolean TAO_Policies::use_proxy_offers (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (USE_PROXY_OFFERS, TAO_IN_ENV); } CORBA::Boolean TAO_Policies::exact_type_match (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (EXACT_TYPE_MATCH, TAO_IN_ENV); } @@ -753,7 +753,7 @@ TAO_Policies::exact_type_match (CORBA::Environment& TAO_IN_ENV) const CosTrading::TraderName* TAO_Policies::starting_trader (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)) { CosTrading::TraderName* trader_name = 0; @@ -777,7 +777,7 @@ TAO_Policies::starting_trader (CORBA::Environment& TAO_IN_ENV) const CosTrading::FollowOption TAO_Policies::link_follow_rule (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::FollowOption return_value = this->trader_.import_attributes ().def_follow_policy (); @@ -808,7 +808,7 @@ TAO_Policies::link_follow_rule (CORBA::Environment& TAO_IN_ENV) const CosTrading::FollowOption TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info, CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)) @@ -834,14 +834,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info, CORBA::ULong TAO_Policies::hop_count (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (HOP_COUNT, TAO_IN_ENV); } CosTrading::Admin::OctetSeq* TAO_Policies::request_id (CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::Admin::OctetSeq* request_id = 0; @@ -868,7 +868,7 @@ TAO_Policies:: copy_in_follow_option (CosTrading::PolicySeq& policy_seq, const CosTrading::Link::LinkInfo& link_info, CORBA::Environment& TAO_IN_ENV) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)) { ACE_UNUSED_ARG (TAO_IN_ENV); @@ -1097,7 +1097,7 @@ void TAO_Offer_Modifier:: delete_properties (const CosTrading::PropertyNameSeq& deletes, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, + ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, CosTrading::Register::MandatoryProperty, CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) @@ -1137,7 +1137,7 @@ void TAO_Offer_Modifier:: merge_properties (const CosTrading::PropertySeq& modifies, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, @@ -1417,7 +1417,7 @@ TAO_Offer_Filter::limits_applied (void) TAO_Property_Filter:: TAO_Property_Filter (const SPECIFIED_PROPS& desired_props, CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) : policy_ (desired_props._d ()) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index ead8aa6c008..1770754512f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -70,7 +70,7 @@ public: // 0 when the index is out of bounds. CORBA::Any* property_value(int index, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); + ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // Returns value of the property whose index is <index>. If the // property at that index is dynamic and the trader supports dynamic @@ -135,7 +135,7 @@ public: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties, CORBA::Environment& _env, CORBA::Boolean supports_dp = 1) - TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName, + ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, CosTrading::IllegalPropertyName)); TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer, @@ -151,7 +151,7 @@ public: CORBA::Any* property_value(const char* property_name, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); + ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // This method is identical to its counterpart in // TAO_Property_Evaluator, except property_value first discovers the @@ -194,12 +194,12 @@ public: virtual ~TAO_Dynamic_Property (void); void destroy (void); - + virtual CORBA::Any* evalDP(const char* name, CORBA::TypeCode_ptr returned_type, const CORBA::Any& extra_info, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, + ACE_THROW_SPEC ((CORBA::SystemException, CosTradingDynamic::DPEvalFailure)) = 0; // Dynamic property evaluation call-back method. @@ -263,7 +263,7 @@ public: TAO_Policies (TAO_Trader_Base& trader, const CosTrading::PolicySeq& policies, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, + ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, CosTrading::DuplicatePolicyName)); // BEGIN SPEC @@ -291,7 +291,7 @@ public: ~TAO_Policies (void); CORBA::ULong search_card (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "search_card" policy indicates to the trader the maximum @@ -303,7 +303,7 @@ public: // END SPEC CORBA::ULong match_card (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "match_card" policy indicates to the trader the maximum @@ -315,7 +315,7 @@ public: // END SPEC CORBA::ULong return_card (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "return_card" policy indicates to the trader the maximum @@ -329,7 +329,7 @@ public: // = Offer consideration policies CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "use_modifiable_properties" policy indicates whether the @@ -342,7 +342,7 @@ public: // END SPEC CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "use_dynamic_properties" policy indicates whether the trader @@ -355,7 +355,7 @@ public: // END SPEC CORBA::Boolean use_proxy_offers (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "use_proxy_offers" policy indicates whether the trader should @@ -367,7 +367,7 @@ public: // END SPEC CORBA::Boolean exact_type_match (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "exact_type_match" policy indicates to the trader whether the @@ -379,7 +379,7 @@ public: // = Federated trader policies (not implemented yet) CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)); // BEGIN SPEC // The "starting_trader" policy facilitates the distribution of the @@ -398,7 +398,7 @@ public: // END SPEC CosTrading::FollowOption link_follow_rule (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Determine the link follow policy for this query overall. // BEGIN SPEC @@ -410,7 +410,7 @@ public: CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info, CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); @@ -424,7 +424,7 @@ public: // trader.def_follow_policy) CORBA::ULong hop_count (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC // The "hop_count" policy indicates to the trader the maximum number @@ -439,7 +439,7 @@ public: // END SPEC CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Return the request_id passed to the query method across a link to // another trader. @@ -454,7 +454,7 @@ public: void copy_in_follow_option (CosTrading::PolicySeq& policy_seq, const CosTrading::Link::LinkInfo& link_info, CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)); // Determine the link follow policy to pass down the link with <link_name>. // This method returns the link_follow_rule for a link whose name is @@ -469,12 +469,12 @@ private: CORBA::ULong ulong_prop (POLICY_TYPE pol, CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconclile a ULong property with its default. CORBA::Boolean boolean_prop (POLICY_TYPE pol, CORBA::Environment& _env) const - TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconcile a Boolean property with its debault. TAO_Policies (const TAO_Policies&); @@ -594,7 +594,7 @@ public: void delete_properties (const CosTrading::PropertyNameSeq& deletes, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, + ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, CosTrading::Register::MandatoryProperty, CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); @@ -603,7 +603,7 @@ public: void merge_properties (const CosTrading::PropertySeq& modifies, CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, @@ -754,7 +754,7 @@ public: TAO_Property_Filter (const SPECIFIED_PROPS& desired_props, CORBA::Environment& env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // Verify that the specified properties are correct. |