From c897b5050612b6c8192ab1f75df18e47d1ad9729 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 12 Feb 2007 09:23:36 +0000 Subject: Mon Feb 12 09:20:14 UTC 2007 Johnny Willemsen --- TAO/examples/Quoter/Factory_Finder_i.cpp | 2 -- TAO/examples/Quoter/Factory_Finder_i.h | 4 +--- TAO/examples/Quoter/Generic_Factory_i.cpp | 5 ----- TAO/examples/Quoter/Generic_Factory_i.h | 9 ++------- TAO/examples/Quoter/Quoter_i.cpp | 17 ----------------- TAO/examples/Quoter/Quoter_i.h | 27 +++++---------------------- 6 files changed, 8 insertions(+), 56 deletions(-) (limited to 'TAO/examples/Quoter') diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 5d72123e647..dcd461128ab 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -41,8 +41,6 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void) CosLifeCycle::Factories * Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory)) { const char *exception_message = "Null Message"; diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 0a3945c5d55..bcd6f4c4996 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -28,9 +28,7 @@ public: Quoter_Factory_Finder_i (int debug_level = 1); ~Quoter_Factory_Finder_i (void); - virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory)); + virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key); // Returns a sequence of Factories if factories matching the // factory_key were found. If no factory was found, then the // NoFactory exception, defined in CosLifeCycle, is raised. diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 298459a9648..74eb8e88b8f 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -37,7 +37,6 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) CORBA::Boolean Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -89,10 +88,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { Stock::Quoter_var quoter_var; try diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index 8245312a87c..d5f46a21778 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -29,17 +29,12 @@ public: Quoter_Generic_Factory_i (int debug_level = 1); ~Quoter_Generic_Factory_i (void); - CORBA::Boolean supports (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean supports (const CosLifeCycle::Key &factory_key); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the . CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Returns an object reference to a newly created object, though the // Generic Factory itself cannot create objects, it will forward the // request to a more concrete Factory. diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index a359d918ee9..9e0ad3525cc 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -89,8 +89,6 @@ int Quoter_Factory_i::init (void) Stock::Quoter_ptr Quoter_Factory_i::create_quoter (const char *) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Quoter)) { this->next_quoter_ = (this->next_quoter_ + 1) % this->quoter_num_; @@ -126,9 +124,6 @@ Quoter_i::~Quoter_i (void) CORBA::Long Quoter_i::get_quote (char const *) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Stock, - Stock::Invalid_Quoter)) { return 42; } @@ -140,11 +135,6 @@ CosLifeCycle::LifeCycleObject_ptr Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &/*the_criteria*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotCopyable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { const char *exception_message = "Null message"; CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr = @@ -258,11 +248,6 @@ void Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, const CosLifeCycle::Criteria & /* the_criteria */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotMovable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { ACE_ERROR ((LM_ERROR, "Quoter_i::move: The Quoter object is not movable!")); @@ -275,8 +260,6 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, void Quoter_i::remove (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NotRemovable)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n")); diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h index b0bdc032f20..06d24a017c0 100644 --- a/TAO/examples/Quoter/Quoter_i.h +++ b/TAO/examples/Quoter/Quoter_i.h @@ -43,35 +43,20 @@ public: ~Quoter_i (void); // Destructor - virtual CORBA::Long get_quote (const char *stock_name) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Stock, - Stock::Invalid_Quoter)); + virtual CORBA::Long get_quote (const char *stock_name); // Returns the current quote for the stock // = Lifecycle methods virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotCopyable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Make a copy of this object virtual void move (CosLifeCycle::FactoryFinder_ptr there, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotMovable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Move this object using - virtual void remove (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NotRemovable)); + virtual void remove (void); // Removes the object. private: @@ -105,9 +90,7 @@ public: int init (void); // Initialize everything in the factory - virtual Stock::Quoter_ptr create_quoter (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Quoter)); + virtual Stock::Quoter_ptr create_quoter (const char *name); // Return the quoter by the id . private: -- cgit v1.2.1