diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-03 19:30:50 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-03 19:30:50 +0000 |
| commit | 106147ac01d7b8e3041fdd06ec18f3f96a81bae4 (patch) | |
| tree | 045983efe0498c53a7714d67597129dc00494f11 | |
| parent | 5dda5dbadf11a115aa4c51670d08dfde37cbb138 (diff) | |
| download | ATCD-106147ac01d7b8e3041fdd06ec18f3f96a81bae4.tar.gz | |
Further transitions to the TAO_ENV_ARG macros
224 files changed, 801 insertions, 900 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index c813836228f..6349e4d11e5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -34,8 +34,6 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // Print out the _this() method. *os << "::" << non_amh_name << " *_this (" << be_idt << be_idt_nl - << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "TAO_default_environment ()" - << be_uidt << be_uidt_nl + << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index e12ca741dbe..628b7d7c9c1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -118,9 +118,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// set the ownership" << be_nl << be_nl << "// overridden ServantBase operations" << be_nl << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl - << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "TAO_default_environment ()" - << be_uidt << be_uidt_nl + << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n"; if (node->traverse_inheritance_graph ( diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp index 4628d2db252..b3256a1274c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -161,13 +161,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template <class T> ACE_INLINE " << "PortableServer::POA_ptr" << be_nl << fulltiename - << "<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)" << be_nl + << "<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl << "if (!CORBA::is_nil (this->poa_.in ()))" << be_idt_nl << "return PortableServer::POA::_duplicate (this->poa_.in ());\n" << be_uidt_nl << "return this->" << localskelname - << "::_default_POA (ACE_TRY_ENV);" << be_uidt_nl + << "::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "}\n\n"; if (node->traverse_inheritance_graph (be_visitor_interface_tie_si::method_helper, os) == -1) diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp index 87502ee0b10..1a6f7ec52b6 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp @@ -46,7 +46,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price) } void -Quoter_Stock_i::disconnect_push_supplier (CORBA::Environment&) +Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { // Forget about the consumer it is not there anymore diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h index e094971992e..995dabddc7a 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h @@ -23,7 +23,7 @@ public: CORBA::Double price () throw (CORBA::SystemException); void set_price (CORBA::Double new_price) throw (CORBA::SystemException); - void disconnect_push_supplier (CORBA::Environment&) + void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException); void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp index 97c824e7306..672e06cb7f9 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp @@ -18,12 +18,12 @@ protected: ref_count_(0) {} public: - virtual void _add_ref (CORBA_Environment & /*ACE_TRY_ENV*/ ) + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL) { ++this->ref_count_; } - virtual void _remove_ref (CORBA_Environment & /*ACE_TRY_ENV*/) + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL) { CORBA::ULong new_count = --this->ref_count_; @@ -95,7 +95,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price) } void -Quoter_Stock_i::disconnect_push_supplier (CORBA::Environment&) +Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { // Forget about the consumer it is not there anymore diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h index d2597a51f55..3d074a8e31a 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h @@ -24,7 +24,7 @@ public: CORBA::Double price () throw (CORBA::SystemException); void set_price (CORBA::Double new_price) throw (CORBA::SystemException); - void disconnect_push_supplier (CORBA::Environment&) + void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h index a4526194e9d..15f12eb3e58 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h @@ -118,9 +118,6 @@ private: int shutdown_; // Flag for server shutdown. - CORBA::Environment env_; - // Environment variable. - TAO_Naming_Client naming_services_client_; // An instance of the name client used for resolving the factory // objects. diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp index ad6d9ae5f6c..d78291ee729 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp @@ -72,7 +72,7 @@ Consumer_Signal_Handler::quit_on_signal (void) ACE_DEBUG ((LM_DEBUG, "Consumer Unregistered\n")); } - this->consumer_handler_->consumer_servant_->shutdown (ACE_TRY_ENV); + this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h index c547ae74ddb..17562742f47 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.h +++ b/TAO/examples/Callback_Quoter/Supplier_i.h @@ -91,9 +91,6 @@ private: char *ior_; // IOR of the obj ref of the Notifier. - CORBA::Environment env_; - // Environment variable. - TAO_Naming_Client naming_services_client_; // An instance of the name client used for resolving the factory // objects. diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h index 4873b469b31..86b76d1bfc3 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.h +++ b/TAO/examples/Load_Balancing/Identity_Client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv[]); // Initializes <orb_manager_>, and parses commandline arguments. - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // See TITLE. private: diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h index 6dff27b0c0a..c9aea348aa8 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h @@ -44,7 +44,7 @@ public: // Initialize the <Load_Balancing_Service>: initializes the ORB, parses // arguments, creates a servant ... - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Run the server. private: diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h index abbd71679d0..64c168016e4 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv[]); // Initializes <orb_manager_>, and parses commandline arguments. - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // See TITLE. private: diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h index 4c49904fcf6..cf39008b21d 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h @@ -44,7 +44,7 @@ public: // Initialize the <Load_Balancing_Service>: initializes the ORB, parses // arguments, creates a servant ... - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Run the server. private: diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h index aac66ba4c31..d377718d42f 100644 --- a/TAO/examples/Logging/Logging_Test_i.h +++ b/TAO/examples/Logging/Logging_Test_i.h @@ -69,10 +69,10 @@ private: const char *msg); // Prepares the <Log_Record> for logging. - int init_naming_service (CORBA::Environment &ACE_TRY_ENV); + int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Initialises the name server and resolves the logger_factory - int init_loggers (CORBA::Environment &ACE_TRY_ENV); + int init_loggers (TAO_ENV_SINGLE_ARG_DECL); // Instantiates the 2 logger member variables void show_record (Logger::Log_Record &newrec); diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h index 2cb7f66d27a..fd27cedbcb3 100644 --- a/TAO/examples/POA/Forwarding/MyFooServant.h +++ b/TAO/examples/POA/Forwarding/MyFooServant.h @@ -36,18 +36,18 @@ public: MyFooServantActivator &activator, CORBA::Long value); - virtual CORBA::Long doit (CORBA::Environment &env) + virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Setup forwarding - virtual void forward (CORBA::Environment &env) + virtual void forward (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Cannot_Forward)); - virtual void shutdown (CORBA::Environment &env) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. protected: diff --git a/TAO/examples/POA/TIE/Foo_i.cpp b/TAO/examples/POA/TIE/Foo_i.cpp index 5f8b8e67cb1..65d50eaa5e9 100644 --- a/TAO/examples/POA/TIE/Foo_i.cpp +++ b/TAO/examples/POA/TIE/Foo_i.cpp @@ -26,7 +26,7 @@ ACE_RCSID(TIE, Foo_i, "$Id$") // Return this->value CORBA::Long -Tie_i::doit (CORBA::Environment &/*env*/) +Tie_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -42,7 +42,7 @@ A_i::A_i (CORBA::Long value, // Return this->value CORBA::Long -A_i::doit (CORBA::Environment &/*env*/) +A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -50,7 +50,7 @@ A_i::doit (CORBA::Environment &/*env*/) // Return the Default POA of this Servant PortableServer::POA_ptr -A_i::_default_POA (CORBA::Environment &/*env*/) +A_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -65,7 +65,7 @@ Outer_i::B_i::B_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::B_i::doit (CORBA::Environment &/*env*/) +Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -73,7 +73,7 @@ Outer_i::B_i::doit (CORBA::Environment &/*env*/) // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::B_i::_default_POA (CORBA::Environment &/*env*/) +Outer_i::B_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -88,7 +88,7 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::Inner_i::C_i::doit (CORBA::Environment &/*env*/) +Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -96,7 +96,7 @@ Outer_i::Inner_i::C_i::doit (CORBA::Environment &/*env*/) // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::Inner_i::C_i::_default_POA (CORBA::Environment &/*env*/) +Outer_i::Inner_i::C_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/TIE/Foo_i.h b/TAO/examples/POA/TIE/Foo_i.h index fdf7fce2ab6..1b3e190bd97 100644 --- a/TAO/examples/POA/TIE/Foo_i.h +++ b/TAO/examples/POA/TIE/Foo_i.h @@ -25,7 +25,7 @@ public: Tie_i (CORBA::Long value); // Simple doit method - virtual CORBA::Long doit (CORBA::Environment &env) + virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -41,11 +41,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (CORBA::Environment &env) + virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); protected: @@ -67,11 +67,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (CORBA::Environment &env) + virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); protected: @@ -93,11 +93,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (CORBA::Environment &env) + virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); protected: diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h index b8b6526bc27..b8f398daf6e 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.h +++ b/TAO/examples/Simple/bank/Bank_Client_i.h @@ -50,15 +50,15 @@ private: int check_accounts (void); // Method that calls all the test functions - void test_for_different_name (CORBA::Environment &env); + void test_for_different_name (TAO_ENV_SINGLE_ARG_DECL); // Tests if accounts opened with different names return a different account // reference. - void test_for_same_name (CORBA::Environment &env); + void test_for_same_name (TAO_ENV_SINGLE_ARG_DECL); // Tests if accounts opened with the same name return the same // object reference. - void test_for_overdraft (CORBA::Environment &env); + void test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL); // Tests for the Overdraft Exception when the client tries to // withdraw more money than the current balance. }; diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index 6880a8ae3eb..c32a015f0e5 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -30,7 +30,7 @@ Time_Client_i::run (const char *name, ACE_TRY { //Make the RMI. - CORBA::Long timedate = client->current_time (ACE_TRY_ENV); + CORBA::Long timedate = client->current_time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Print out value @@ -42,7 +42,7 @@ Time_Client_i::run (const char *name, ascii_timedate)); if (client.shutdown () == 1) - client->shutdown (ACE_TRY_ENV); + client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp index 5e49361a835..13c0494ecd2 100644 --- a/TAO/examples/Simple/time/Time_i.cpp +++ b/TAO/examples/Simple/time/Time_i.cpp @@ -35,7 +35,7 @@ Time_i::orb (CORBA::ORB_ptr o) // Return the current date/time on the server. CORBA::Long -Time_i::current_time (CORBA::Environment &) +Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Long (ACE_OS::time (0)); @@ -44,7 +44,7 @@ Time_i::current_time (CORBA::Environment &) // Shutdown. void -Time_i::shutdown (CORBA::Environment & ) +Time_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index 2236ba9d8ea..caa7cebeada 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -43,11 +43,11 @@ public: ~Time_i (void); // Destructor - virtual CORBA::Long current_time (CORBA::Environment &env) + virtual CORBA::Long current_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the current time/date on the server - virtual void shutdown (CORBA::Environment &env) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 1e65742113d..259919ec604 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -77,7 +77,7 @@ private: public: - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index 238b386ff03..52f1f9c35ee 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -85,7 +85,7 @@ private: // = DESCRIPTION // Private class that implements a termination servant. { - void shutdown (CORBA::Environment &_env) + void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp index 872a882823f..9710a5fb7ee 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp @@ -21,39 +21,39 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) } CORBA::DefinitionKind -TAO_ConsumesDef_i::def_kind (CORBA::Environment &) +TAO_ConsumesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Consumes; } void -TAO_ConsumesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_ConsumesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ConsumesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_ConsumesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ConsumesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_ConsumesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ConsumesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_ConsumesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h index 94383537afd..20c1acf586d 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h @@ -51,36 +51,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp index bdcd681fa01..eac6599262e 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp @@ -19,39 +19,39 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void) } CORBA::DefinitionKind -TAO_EmitsDef_i::def_kind (CORBA::Environment &) +TAO_EmitsDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Emits; } void -TAO_EmitsDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_EmitsDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EmitsDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EmitsDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_EmitsDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_EmitsDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_EmitsDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EmitsDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h index e58f8327ffc..4759d541ab8 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h @@ -51,36 +51,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp index 9f967d089eb..597ad4f0235 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp @@ -21,39 +21,39 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void) } CORBA::DefinitionKind -TAO_FactoryDef_i::def_kind (CORBA::Environment &) +TAO_FactoryDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Factory; } void -TAO_FactoryDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_FactoryDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_FactoryDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_FactoryDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_FactoryDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_FactoryDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_FactoryDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ ) +TAO_FactoryDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h index 12cdb254fbc..09718358b0c 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h @@ -50,36 +50,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp index 88e363a16f5..a8a16e4178b 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp @@ -19,39 +19,39 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void) } CORBA::DefinitionKind -TAO_FinderDef_i::def_kind (CORBA::Environment &) +TAO_FinderDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Finder; } void -TAO_FinderDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_FinderDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_FinderDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_FinderDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_FinderDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_FinderDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_FinderDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ ) +TAO_FinderDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h index 34b1cc78c93..ea9d60edcfa 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h @@ -50,36 +50,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h index 521fdcef356..3090d1cf163 100644 --- a/TAO/orbsvcs/IFR_Service/IDLType_i.h +++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h @@ -54,16 +54,14 @@ public: // Destructor. virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Defined in concrete classes. virtual CORBA::TypeCode_ptr type_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Defined in concrete classes. }; diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h index eca29249604..315b1a508e6 100644 --- a/TAO/orbsvcs/IFR_Service/IRObject_i.h +++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h @@ -53,23 +53,20 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual- the unlocked version called by destroy() wrapper. diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp index 9e2963720c9..81063de075e 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp @@ -19,45 +19,45 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void) } CORBA::DefinitionKind -TAO_ModuleDef_i::def_kind (CORBA::Environment &) +TAO_ModuleDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Module; } void -TAO_ModuleDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_ModuleDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ModuleDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) +TAO_ModuleDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (ACE_TRY_ENV); + TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (ACE_TRY_ENV); + TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_ModuleDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_ModuleDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) +TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -68,15 +68,15 @@ TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (ACE_TRY_ENV); + retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ModuleDescription md; - md.name = this->name_i (ACE_TRY_ENV); + md.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - md.id = this->id_i (ACE_TRY_ENV); + md.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -87,7 +87,7 @@ TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) md.defined_in = container_id.c_str (); - md.version = this->version_i (ACE_TRY_ENV); + md.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= md; diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h index ef5e8d224fd..d6f1c902c12 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h @@ -52,37 +52,32 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h index d369fbba640..b3e758f97ac 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h @@ -51,23 +51,20 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp index 448f9c904de..f6343693d55 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp @@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) } CORBA::DefinitionKind -TAO_PrimitiveDef_i::def_kind (CORBA::Environment &) +TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Primitive; } void -TAO_PrimitiveDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_PrimitiveDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) +TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type (CORBA::Environment &ACE_TRY_ENV) +TAO_PrimitiveDef_i::type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (ACE_TRY_ENV); + return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type_i (CORBA::Environment &) +TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; @@ -110,16 +110,16 @@ TAO_PrimitiveDef_i::type_i (CORBA::Environment &) } CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind (CORBA::Environment &ACE_TRY_ENV) +TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null); - return this->kind_i (ACE_TRY_ENV); + return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind_i (CORBA::Environment &) +TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h index 4d847356aec..93bd5663df3 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h @@ -50,50 +50,43 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a primitive kind - raises BAD_INV_ORDER. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Must implement this here because it's pure virtual in the // base class. virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PrimitiveKind kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::PrimitiveKind kind_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp index 065b4722ece..67d87d93f3a 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp @@ -20,39 +20,39 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) } CORBA::DefinitionKind -TAO_ProvidesDef_i::def_kind (CORBA::Environment &) +TAO_ProvidesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Provides; } void -TAO_ProvidesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_ProvidesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ProvidesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_ProvidesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ProvidesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_ProvidesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_ProvidesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -60,16 +60,16 @@ TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) } CORBA_InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV) +TAO_ProvidesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); - return this->interface_type_i (ACE_TRY_ENV); + return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_ProvidesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h index 638bd7b82af..519bb360a63 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h @@ -50,49 +50,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_InterfaceDef_ptr interface_type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef_ptr interface_type_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp index e902fb59289..3010f401007 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp @@ -21,39 +21,39 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void) } CORBA::DefinitionKind -TAO_PublishesDef_i::def_kind (CORBA::Environment &) +TAO_PublishesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Publishes; } void -TAO_PublishesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_PublishesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_PublishesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_PublishesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_PublishesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_PublishesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_PublishesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_PublishesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h index 6272ca66317..6e68f4b1f91 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h @@ -51,36 +51,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp index 523d1c56536..859c5fa8359 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp @@ -21,16 +21,16 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void) } CORBA_Contained::Description * -TAO_TypedefDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_TypedefDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) +TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -41,15 +41,15 @@ TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (ACE_TRY_ENV); + retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_TypeDescription td; ACE_CHECK_RETURN (0); - td.name = this->name_i (ACE_TRY_ENV); + td.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); - td.id = this->id_i (ACE_TRY_ENV); + td.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -60,10 +60,10 @@ TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) td.defined_in = container_id.c_str (); - td.version = this->version_i (ACE_TRY_ENV); + td.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - td.type = this->type_i (ACE_TRY_ENV); + td.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= td; diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h index 9d66c140f1d..40e966cded2 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h @@ -53,16 +53,14 @@ public: // Destructor virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp index e9f793abaf6..e36bdaa2ee9 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp @@ -18,39 +18,39 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void) } CORBA::DefinitionKind -TAO_UsesDef_i::def_kind (CORBA::Environment &) +TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Uses; } void -TAO_UsesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_UsesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_UsesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_UsesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -58,16 +58,16 @@ TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) } CORBA_InterfaceDef_ptr -TAO_UsesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV) +TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); - return this->interface_type_i (ACE_TRY_ENV); + return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDef_ptr -TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -75,16 +75,16 @@ TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */) } CORBA::Boolean -TAO_UsesDef_i::is_multiple (CORBA::Environment &ACE_TRY_ENV) +TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_multiple_i (ACE_TRY_ENV); + return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_UsesDef_i::is_multiple_i (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h index a71572e0997..fae4dae86f8 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h @@ -50,61 +50,52 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_InterfaceDef_ptr interface_type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef_ptr interface_type_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_multiple ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_multiple_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff index 532b5c0956c..ef31bb029eb 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff @@ -44,7 +44,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -175,6 +171,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -77,7 +77,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -523,6 +521,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -110,7 +110,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1109,6 +1109,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -143,7 +143,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1481,6 +1483,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -176,7 +176,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1737,6 +1741,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff index 7ef393f6660..ce3c642d39b 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff @@ -45,7 +45,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -435,6 +431,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -78,7 +78,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -886,6 +884,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -111,7 +111,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1209,6 +1209,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -144,7 +144,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1668,6 +1670,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -177,7 +177,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -2152,6 +2156,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -210,7 +210,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -2476,6 +2482,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -243,7 +243,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -2774,6 +2782,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -276,7 +276,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3039,6 +3049,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -309,7 +309,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3215,6 +3227,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -342,7 +342,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3416,6 +3430,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -375,7 +375,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3626,6 +3642,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -408,7 +408,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3885,6 +3903,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -441,7 +441,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -4169,6 +4189,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -474,7 +474,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -4636,6 +4658,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -507,7 +507,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -4984,6 +5008,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -540,7 +540,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -5447,6 +5473,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -573,7 +573,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -6035,6 +6063,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -606,7 +606,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -6532,6 +6562,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -639,7 +639,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -6964,6 +6996,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff index 0183dd4a15d..2a03ee5d895 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff @@ -33,7 +33,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -400,6 +401,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); + private: @@ -61,7 +61,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -683,6 +687,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -89,7 +89,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -963,6 +970,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -117,7 +117,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1252,6 +1262,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -145,7 +145,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1525,6 +1538,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -173,7 +173,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1781,6 +1797,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -201,7 +201,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -2037,6 +2056,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -229,7 +229,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -2715,6 +2737,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -257,7 +257,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3122,6 +3147,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -285,7 +285,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3467,6 +3495,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -313,7 +313,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -3795,6 +3826,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -341,7 +341,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -4385,6 +4419,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff index c2d07095b4a..fcec20c57a1 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff @@ -45,7 +45,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -234,6 +230,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -78,7 +78,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -590,6 +588,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -111,7 +111,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1346,6 +1346,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: @@ -144,7 +144,7 @@ // as soon as their use is necessary. void create_proxy ( @@ -1807,6 +1809,8 @@ - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ); +private: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp index 53aabcd739f..6edb2e11821 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp @@ -13,7 +13,7 @@ run_standalone (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int status = server.init (ACE_TRY_ENV); + int status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -22,10 +22,10 @@ run_standalone (void) } else { - server.run (ACE_TRY_ENV); + server.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (ACE_TRY_ENV); + status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp index d4f32bb11c1..4d8c96055aa 100644 --- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp @@ -79,7 +79,7 @@ ImR_NT_Service::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - status = server.init (ACE_TRY_ENV); + status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -89,10 +89,10 @@ ImR_NT_Service::svc (void) else { report_status (SERVICE_RUNNING); - server.run (ACE_TRY_ENV); + server.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (ACE_TRY_ENV); + status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index 452b8c9a24f..ba2e7bf843c 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -27,7 +27,7 @@ Criteria_Evaluator::~Criteria_Evaluator () } LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * -Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV) +Criteria_Evaluator::getInitialization (TAO_ENV_SINGLE_ARG_DECL) { LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0; @@ -45,7 +45,7 @@ Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV) } char * -Criteria_Evaluator::getFilter (CORBA::Environment &ACE_TRY_ENV) +Criteria_Evaluator::getFilter (TAO_ENV_SINGLE_ARG_DECL) { const char* string; CORBA::Any value; diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index b55af2bd9e0..13569acd21f 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -28,16 +28,16 @@ public: Criteria_Evaluator (const CosLifeCycle::Criteria &criteria); ~Criteria_Evaluator (void); - LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &); + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); - char * getFilter (CORBA::Environment &); + char * getFilter (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); - LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &) + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } - char * getPreferences (CORBA::Environment &) + char * getPreferences (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index fdf326c5a02..73ef07e2163 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -133,7 +133,7 @@ TAO_NT_Naming_Service::svc (void) ACE_TRY { report_status (SERVICE_RUNNING); - naming_service.run (ACE_TRY_ENV); + naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp index e21bdf26485..23dff06b24e 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -15,7 +15,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - naming_service.run (ACE_TRY_ENV); + naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index 0d0fc4576ec..b7d9970a70c 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -42,7 +42,7 @@ public: virtual int init (int argc, char *argv[]); // Initialize the Naming Service with the arguments. - int run (CORBA_Environment& ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Run the TAO_Naming_Service. virtual ~TAO_Naming_Service (void); diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index d04423f9799..f741fb60e6b 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -51,7 +51,7 @@ public: int init (int argc, char *argv[]); // Initialize the Scheduling Service with the arguments. - int run (CORBA_Environment& ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Run the TAO_Scheduling_Service. ~TAO_Scheduling_Service (void); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 362875858cc..87e69d4fa69 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -26,14 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil = CosEventChannelAdmin::ProxyPushSupplier::_nil (); RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier = - this->rtec_consumeradmin_->obtain_push_supplier (ACE_TRY_ENV); + this->rtec_consumeradmin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier; @@ -47,11 +47,11 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV auto_proxysupplier (proxypushsupplier); CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj = - auto_proxysupplier.get ()->_this (ACE_TRY_ENV); + auto_proxysupplier.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); // give the ownership to the POA. - auto_proxysupplier.get ()->_remove_ref (ACE_TRY_ENV); + auto_proxysupplier.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); auto_proxysupplier.release (); @@ -59,7 +59,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &) +TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index cba88a57bcb..d27a0bc2575 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -55,12 +55,12 @@ public: RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier(CORBA::Environment &ACE_TRY_ENV) + obtain_push_supplier(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPushSupplier_ptr. virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier(CORBA::Environment &ACE_TRY_ENV) + obtain_pull_supplier(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPullSupplier_ptr. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index 64e839f82b4..688c8982937 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -26,14 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = CosEventChannelAdmin::ProxyPushConsumer::_nil (); RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer = - this->rtec_supplieradmin_->obtain_push_consumer (ACE_TRY_ENV); + this->rtec_supplieradmin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer; @@ -46,11 +46,11 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV auto_proxyconsumer (proxypushconsumer); CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj = - auto_proxyconsumer.get ()->_this (ACE_TRY_ENV); + auto_proxyconsumer.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); // give the ownership to the POA. - auto_proxyconsumer.get ()->_remove_ref (ACE_TRY_ENV); + auto_proxyconsumer.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); auto_proxyconsumer.release (); @@ -58,7 +58,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &) +TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 8150bbb2e90..04ea411c3fc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -57,12 +57,12 @@ public: // error. virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) + obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPushConsumer_ptr. virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV) + obtain_pull_consumer(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPullConsumer_ptr. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 2e4bcb2cc21..ba082729cc7 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -40,7 +40,7 @@ public: // = The CosEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp index 921f5d7c1bf..f60d585f1ec 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp @@ -9,7 +9,7 @@ Supplier::Supplier (void) } void -Supplier::disconnect_push_supplier (CORBA::Environment &) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index a75bdd5b416..e6139801c49 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -44,7 +44,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index 7410fc2d03b..72a72f74395 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -41,7 +41,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index beec3b6d678..7448af5dadc 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server SLevel1_Server_i (); /// - CORBA::Boolean authorize_level1 (CORBA::Environment &) + CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean authorize_level2 (CORBA::Environment &) + CORBA::Boolean authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); static int authorized_1; diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index f48848f066c..faf10074707 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -3091,7 +3091,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Boolean TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl - TAO_ENV_ARG_DECL_NOT_USED) + TAO_ENV_ARG_DECL) { // ACE_UNUSED_ARG (media_ctrl); diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl index f71e9cd2610..f3c1fb266b7 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl @@ -124,3 +124,4 @@ typedef sequence <NameValuePair> Criteria; */ #endif /* TAO_LIFECYCLE_IDL */ + diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index 8f2a176d4ab..f8104946aee 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -20,7 +20,11 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); - this->target_->connected_i (this->object_, *env); + this->target_->connected_i (this->object_ +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + , *env +#endif + ); return 0; } @@ -33,7 +37,11 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg) if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); - this->target_->reconnected_i (this->object_, *env); + this->target_->reconnected_i (this->object_ +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + , *env +#endif + ); return 0; } @@ -46,7 +54,11 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg) if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); - this->target_->disconnected_i (this->object_, *env); + this->target_->disconnected_i (this->object_ +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + , *env +#endif + ); return 0; } @@ -59,7 +71,11 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg) if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); - this->target_->shutdown_i (*env); + this->target_->shutdown_i ( +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + *env +#endif + ); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 4e07e5f77ca..ddcfd4faa5f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (ACE_TRY_ENV); + return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (CORBA::Environment&) +TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 6fd0c393669..cac71634fde 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -60,11 +60,11 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (CORBA::Environment &) + obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 56a2367174b..b58780478d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (ACE_TRY_ENV); + return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (CORBA::Environment&) +TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 5276ac001f3..73e32e18315 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -50,11 +50,11 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &) + obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i index bc78c9981b5..395b70bc70b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i @@ -69,37 +69,37 @@ ACE_Push_Consumer_Proxy::correlation (void) } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_ES_Consumer_Module::get_ref (CORBA::Environment &env) +ACE_ES_Consumer_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) { - return this->_this (env); + return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_ES_Supplier_Module::get_ref (CORBA::Environment &env) +ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) { - return this->_this (env); + return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } // ************************************************** ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr -ACE_EventChannel::get_ref (CORBA::Environment &env) +ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL) { - return this->_this (env); + return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_EventChannel::for_suppliers (CORBA::Environment &env) +ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return supplier_module_->get_ref (env); + return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_EventChannel::for_consumers (CORBA::Environment &env) +ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_module_->get_ref (env); + return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE TAO_EC_Timer_Module* diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp index 9c0c198c5d0..4da47b060d7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp @@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) } CORBA::Object_ptr -TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h index 523ff488d9e..93887fc6ac0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h @@ -60,7 +60,7 @@ public: // Destructor // = The Load_Balancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index aca57dc79ed..483db1f88c6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -65,7 +65,7 @@ public: // Destructor. void - destroy (CORBA::Environment &ACE_TRY_ENV) + destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the log object and all contained records. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h index 64bd4e8e80b..54fa37c4495 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h @@ -40,10 +40,10 @@ class TAO_Notify_Export TAO_Notify_Collection_Factory : public ACE_Service_Objec // public: // = Methods to create listener collections. - virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0; // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0; // create update listener list. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h index d14b4ea5a66..127a0966189 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h @@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Command : public ACE_Message_Block TAO_Notify_Command (TAO_Notify_Event_Processor* event_processor, TAO_Notify_Event* event); ~TAO_Notify_Command (); - virtual int execute (CORBA::Environment& ACE_TRY_ENV) = 0; + virtual int execute (TAO_ENV_SINGLE_ARG_DECL) = 0; // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index aed89d83655..0e406596476 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -54,8 +54,6 @@ TAO_Notify_ConsumerAdmin_i::~TAO_Notify_ConsumerAdmin_i (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->my_id_)); - TAO_ENV_DECLARE_NEW_ENV; - delete this->lock_; delete this->event_listener_list_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index 5c3eb07c344..da83f014891 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -39,7 +39,7 @@ TAO_Notify_Default_Collection_Factory::fini (void) } TAO_Notify_EventListener_List* -TAO_Notify_Default_Collection_Factory::create_event_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Default_Collection_Factory::create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { // @@ Pradeep: the copy_on_write versions are a much better choice // for a default than the immediate changes version. The latter @@ -68,7 +68,7 @@ ACE_NEW_THROW_EX (listener_list, } TAO_Notify_UpdateListener_List* -TAO_Notify_Default_Collection_Factory::create_update_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Default_Collection_Factory::create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { /* TAO_Notify_UpdateListener_List* listener_list = diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 1baa1622268..78c621a790d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -51,10 +51,10 @@ public: virtual int fini (void); // = Methods to create listener collections. - virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL); // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL); // create update listener list. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 1bf7a558b67..708164dc121 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -89,7 +89,7 @@ TAO_Notify_EventChannelFactory_i::event_channel_destroyed (CosNotifyChannelAdmin } void TAO_Notify_EventChannelFactory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_LACKS_SUPPRESS_ENV) +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) , #endif CORBA::Boolean destroy_children) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 41750ef9d51..243a60aa35d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -69,7 +69,7 @@ public: // Get the CORBA object. void shutdown (TAO_ENV_SINGLE_ARG_DECL -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_LACKS_SUPPRESS_ENV) +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) , // This is ugly -- destroy_children should come BEFORE the env arg. #endif CORBA::Boolean destroy_children = 0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h index 342f6f3a066..b1646aabdcd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h @@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Event_Dispatch_Command : public TAO_Notify_Co ~TAO_Notify_Event_Dispatch_Command (); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp index 575f62c7fec..7b9859e70f4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp @@ -16,7 +16,7 @@ TAO_Notify_Collection_Factory* TAO_Notify_Factory::collection_factory_ = 0; TAO_Notify_EMO_Factory* TAO_Notify_Factory::emo_factory_ = 0; void -TAO_Notify_Factory::init (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_DECL) { co_factory_ = ACE_Dynamic_Service <TAO_Notify_CO_Factory>::instance (TAO_NOTIFY_DEF_CO_FACTORY_NAME); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h index bc430df663d..e5476598473 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h @@ -62,7 +62,7 @@ class TAO_Notify_Export TAO_Notify_Factory protected: friend class TAO_Notify_EventChannelFactory_i; - static void init (CORBA::Environment &ACE_TRY_ENV); + static void init (TAO_ENV_SINGLE_ARG_DECL); // Initalize the services. static void shutdown (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp index 988ce522565..3e917878450 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp @@ -51,7 +51,7 @@ TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::~TAO_Notify_ID_Pool_Ex () } template <class ID_TYPE, class ID_TYPE_SEQ> ID_TYPE_SEQ* -TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (TAO_ENV_SINGLE_ARG_DECL) { // Figure out the length of the list. size_t len = this->active_list_.size (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h index 658ed8045fc..33471fc7b10 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h @@ -78,7 +78,7 @@ class TAO_Notify_ID_Pool_Ex : public TAO_Notify_ID_Pool <ID_TYPE> TAO_Notify_ID_Pool_Ex (void); ~TAO_Notify_ID_Pool_Ex (); - ID_TYPE_SEQ* get_sequence (CORBA::Environment &ACE_TRY_ENV); + ID_TYPE_SEQ* get_sequence (TAO_ENV_SINGLE_ARG_DECL); // Get a list of all ids in use. // Essentially converts the <active_list_> to a Sequence. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h index 394339bac7c..daaf4567e9b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h @@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Listener_Filter_Eval_Command : public TAO_Not ~TAO_Notify_Listener_Filter_Eval_Command(); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h index 4ec6829e654..50fd2182489 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h @@ -48,7 +48,7 @@ public: ~TAO_Notify_Source_Filter_Eval_Command (); // Destructor. - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp index 59bf538b2a3..d3a54d94d95 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp @@ -34,8 +34,6 @@ TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i () ACE_DEBUG ((LM_DEBUG,"in SA dtor\n")); // Cleanup all resources.. - TAO_ENV_DECLARE_NEW_ENV; - delete this->lock_; this->event_channel_->supplier_admin_destroyed (this->my_id_); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h index c8ab14ad24f..e32a2c9ae3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h @@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Update_Dispatch_Command : public TAO_Notify_C ~TAO_Notify_Update_Dispatch_Command (); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp index 9c0c198c5d0..4da47b060d7 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp @@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) } CORBA::Object_ptr -TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h index 523ff488d9e..93887fc6ac0 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h @@ -60,7 +60,7 @@ public: // Destructor // = The Load_Balancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp index d03376c5459..a0cec544909 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp @@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void) } CORBA::PolicyType -TAO_EstablishTrustPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr -TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EstablishTrustPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EstablishTrustPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::EstablishTrust -TAO_EstablishTrustPolicy::trust (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->trust_; diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h index ebedb814109..5fd059b6a07 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h @@ -51,23 +51,20 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the "establish trust" value associated with this /// policy. virtual Security::EstablishTrust trust ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp index 495ec1e5bc7..3b306b5aaf8 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp @@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void) } CORBA::PolicyType -TAO_QOPPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_QOPPolicy *policy = 0; @@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_QOPPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP -TAO_QOPPolicy::qop (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->qop_; diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h index 1431ec768eb..0579628d355 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h @@ -51,23 +51,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual Security::QOP qop (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 80ef6babdeb..7b7dac9aa22 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -52,7 +52,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, // This is a remote call. CosTime::UTO_var UTO_server = - (*value)->universal_time (ACE_TRY_ENV); + (*value)->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -83,7 +83,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, (UTO_server->utc_time ()).tdf)); #endif - CORBA::ULongLong curr_server_time = UTO_server->time (ACE_TRY_ENV); + CORBA::ULongLong curr_server_time = UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; sum += curr_server_time; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index e77d5d1671a..e7bc02db9c9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -294,7 +294,7 @@ TAO_Literal_Constraint (CORBA::Any* any) CORBA::TCKind corba_type = CORBA::tk_null; ACE_TRY { - corba_type = type->kind (ACE_TRY_ENV); + corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -487,7 +487,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_null; ACE_TRY { - kind = type->kind (ACE_TRY_ENV); + kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -525,9 +525,9 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_void; ACE_TRY_EX (label2) { - CORBA::TypeCode_var typecode = type->content_type (ACE_TRY_ENV); + CORBA::TypeCode_var typecode = type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (label2); - kind = typecode->kind (ACE_TRY_ENV); + kind = typecode->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (label2);; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index ea2a7672860..fd7aa7d1dd7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -113,27 +113,27 @@ public: TAO_Trader_Components (const TAO_Trading_Components_i& comps); // = CosTrading::TraderComponents methods. - virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment &) + virtual CosTrading::Lookup_ptr lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CosTrading::Register_ptr register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CosTrading::Link_ptr link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CosTrading::Proxy_ptr proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CosTrading::Admin_ptr admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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. @@ -152,16 +152,16 @@ public: // = CosTrading::SupportAttributes methods. - virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment &) + virtual CORBA::Boolean supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment &) + virtual CORBA::Boolean supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment &) + virtual CORBA::Boolean supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment &) + virtual CosTrading::TypeRepository_ptr type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -178,47 +178,47 @@ public: // = CosTrading::ImportAttributes methods. - virtual CORBA::ULong def_search_card (CORBA::Environment &) + virtual CORBA::ULong def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_search_card (CORBA::Environment &) + virtual CORBA::ULong max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CORBA::ULong def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_match_card (CORBA::Environment &) + virtual CORBA::ULong max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CORBA::ULong def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_return_card (CORBA::Environment &) + virtual CORBA::ULong max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 &) + virtual CORBA::ULong max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong def_hop_count (CORBA::Environment &) + virtual CORBA::ULong def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_hop_count (CORBA::Environment &) + virtual CORBA::ULong max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::FollowOption def_follow_policy (CORBA::Environment &) + virtual CosTrading::FollowOption def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment &) + virtual CosTrading::FollowOption max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -235,7 +235,7 @@ public: TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs); // = CosTrading::LinkAttributes methods - virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &) + virtual CosTrading::FollowOption max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp index f4a796be00b..6a0d81d8dbe 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp @@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->ptr_->_remove_ref (ACE_TRY_ENV); + this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { // @@ This event should be logged... diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp index 5a622f6bbdd..3b398172a15 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp @@ -21,7 +21,7 @@ ECL_Client_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index 74c5b78db9f..7faf6c5e555 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -39,7 +39,7 @@ public: // AVStreams::QoS & the_qos, // CORBA::Boolean_out met_qos, // char *& named_fdev, -// CORBA::Environment &env = CORBA::Environment::default_environment ()); +// TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // // bridge method for the application to override the consumer object // // creation. Default implementation creates a TAO_FlowConsumer. diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index 5d9174c5da8..428869028e4 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -53,7 +53,7 @@ CC_TestUtils::create_lock_set (void) ACE_TRY { lock_set = - CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_TRY_ENV); + CC_naming_service::Instance()->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (lock_set)) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h index 683008151f8..10ad1725717 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h @@ -34,7 +34,7 @@ public: // = Check the ACE_Task_Base documentation. int svc (void); - void run_iteration (CORBA::Environment &ACE_TRY_ENV); + void run_iteration (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index b9758c338b6..68cb65381d6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h @@ -34,7 +34,7 @@ public: // = Check the ACE_Task_Base documentation. int svc (void); - void run_iteration (CORBA::Environment &ACE_TRY_ENV); + void run_iteration (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index 66cfbdca3a6..34f32a5388d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -54,14 +54,14 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the reconnection flags - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); // Don't dump the EC_Driver results, they are meaningless. - void execute_consumer_test (CORBA::Environment& ACE_TRY_ENV); - void execute_supplier_test (CORBA::Environment& ACE_TRY_ENV); + void execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Separate the suppliers and consumers. private: diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h index b5c401cfe06..4f9bc592bfc 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h @@ -41,14 +41,14 @@ public: // The options controlling the event types are ignored, and only two // consumers are created. - virtual void connect_consumers (CORBA::Environment &ACE_TRY_ENV); - virtual void connect_suppliers (CORBA::Environment &ACE_TRY_ENV); + virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // In this test there are two consumers, the high priority consumer // receives only events from a single high priority supplier. The // other consumer receives events from a set of low priority // suppliers. - virtual void activate_tasks (CORBA::Environment &); + virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Activate the suppliers at different priorities private: diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index e77bd596f8c..5955b95febc 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -47,9 +47,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_Throughput::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Throughput::execute_test (TAO_ENV_SINGLE_ARG_DECL) { - this->EC_Driver::execute_test (ACE_TRY_ENV); + this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); } void diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h index fc1cfeac8b8..8d8b222b3b2 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h @@ -44,7 +44,7 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the throughpution flags - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index fca15cc7e8f..39790e6bf9f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -42,7 +42,7 @@ public: Client_i (CORBA::ORB_ptr orb); // Our constructor - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Initialize the ORB etc. private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index 3990a7d2327..31d1e20115b 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call (CORBA::Environment & /*ACE_TRY_ENV*/) +Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -31,7 +31,7 @@ Simple_Server_i::remote_call (CORBA::Environment & /*ACE_TRY_ENV*/) void -Simple_Server_i::shutdown (CORBA::Environment&) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h index fb1713e4d2b..0c6638822df 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (CORBA::Environment &) + void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp index 6bfdb80ea84..727078a3c98 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp @@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void) } CORBA::Boolean -MCast_Server_i::connect_server (CORBA::Environment &) +MCast_Server_i::connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h index 7a3b81fb2b0..e626d3265b6 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h @@ -11,7 +11,7 @@ public: // Simple method just to see that the client contacted the // server. If does contact, a '0' is returned. - CORBA::Boolean connect_server (CORBA::Environment &) + CORBA::Boolean connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h index 46be09448cf..c2e393aa2a3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h @@ -61,9 +61,6 @@ private: /// Number of airplanes to query for. size_t loop_count_; - /// Environment variable. - CORBA::Environment env_; - /// Server object ptr. Paper_Airplane_Server_ptr server_; diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp index c501db183a1..2acd8e75b87 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp @@ -26,7 +26,7 @@ Airplane_i::~Airplane_i (void) // Returns a random plane and page number char * -Airplane_i::get_plane (CORBA::Environment &) +Airplane_i::get_plane (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h index 817a116ec88..53e121ba139 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h @@ -48,7 +48,7 @@ public: ~Airplane_i (void); /// Returns a random plane. - virtual char *get_plane (CORBA::Environment &ACE_TRY_ENV) + virtual char *get_plane (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h index cedb64af3a3..f6f9e31f68c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h @@ -50,24 +50,24 @@ public: // Execute test code. private: - void array_test (CORBA::Environment &ACE_TRY_ENV); - void enum_test (CORBA::Environment &ACE_TRY_ENV); - void alias_test (CORBA::Environment &ACE_TRY_ENV); - void native_test (CORBA::Environment &ACE_TRY_ENV); - void struct_test (CORBA::Environment &ACE_TRY_ENV); - void union_test (CORBA::Environment &ACE_TRY_ENV); - void exception_test (CORBA::Environment &ACE_TRY_ENV); - void constant_test (CORBA::Environment &ACE_TRY_ENV); - void interface_test (CORBA::Environment &ACE_TRY_ENV); - void move_test (CORBA::Environment &ACE_TRY_ENV); - void module_test (CORBA::Environment &ACE_TRY_ENV); + void array_test (TAO_ENV_SINGLE_ARG_DECL); + void enum_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void alias_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void native_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void struct_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void union_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void exception_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void constant_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void interface_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void move_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void module_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The various IFR tests. int parse_args (int argc, char *argv[]); // Process the command line arguments. - void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(CORBA::Environment &); + void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Array of pointers to the test functions. static const char *test_names_[]; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h index 4cc31795596..3996b1be028 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h @@ -50,8 +50,8 @@ public: // Execute test code. private: - void populate (CORBA::Environment &ACE_TRY_ENV); - void query (CORBA::Environment &ACE_TRY_ENV); + void populate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void query (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The two IFR tests. int parse_args (int argc, diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index 7e20da7c786..927e5f36aa2 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -33,7 +33,7 @@ int main (int argc, char *argv []) if (client.init (argc, argv) == -1) return 1; - result = client.run (ACE_TRY_ENV); + result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 7872b9f2d42..6592e11fe71 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -39,7 +39,7 @@ class NContextExt_Client_i NContextExt_Client_i (void); ~NContextExt_Client_i (void); - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Execute the client example code. int init (int argc, char **argv); diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h index e4e4da436ec..3324b086ffc 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h @@ -45,7 +45,7 @@ public: // thread entry point private: - void validate_connection (CORBA::Environment &); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Validate the connection private: diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp index 6709ae95527..e0e9030be77 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp @@ -12,7 +12,7 @@ Server_Worker::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 19760b5b615..7af168555f1 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -27,13 +27,11 @@ public: SecurityLevel2::Current_ptr current); /// Test method. - virtual void baz (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void baz (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Bar::NoSecurityAttributes)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h index f1716a12bf7..765d81005c0 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h @@ -27,11 +27,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server SecurityLevel1::Current_ptr ss_current); /// Simple method invoked to test if the client reached server etc. - CORBA::Boolean authorize_level1 (CORBA::Environment &) + CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); X509 *create_check_cert (); diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index fd674f01548..03802c59511 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -86,9 +86,6 @@ private: int shutdown_; // Flag for server shutdown. - CORBA::Environment env_; - // Environment variable. - CosTime::TimeService_var clerk_; // Time Service Server object ptr. diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 74a390490d7..75f1fbe0608 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -33,7 +33,7 @@ int main (int argc, char *argv []) return 1; else { - return client.run (ACE_TRY_ENV); + return client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index 223dcb307ba..aad6df15978 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -39,7 +39,7 @@ class IOR_corbaname_Client_i IOR_corbaname_Client_i (void); ~IOR_corbaname_Client_i (void); - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Execute the client example code. int init (int argc, char **argv); diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp index 46de9181071..4712b42c9fe 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp @@ -4,13 +4,13 @@ #include "status_i.h" -corbaname_Status_i::corbaname_Status_i (CORBA::Environment &) +corbaname_Status_i::corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { // Constructor } CORBA::Boolean -corbaname_Status_i::print_status (CORBA::Environment &) +corbaname_Status_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If the client makes a succesful request, return a true value diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h index a2b172ca2de..07c1c1ce442 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h @@ -9,10 +9,9 @@ class corbaname_Status_i : public POA_corbaname::Status { public: - corbaname_Status_i (CORBA::Environment & = - TAO_default_environment()); + corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - CORBA::Boolean print_status (CORBA::Environment & = TAO_default_environment()) + CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/performance-tests/AMI_Latency/Server_Task.cpp b/TAO/performance-tests/AMI_Latency/Server_Task.cpp index 7265eeabd5a..0e7197d7822 100644 --- a/TAO/performance-tests/AMI_Latency/Server_Task.cpp +++ b/TAO/performance-tests/AMI_Latency/Server_Task.cpp @@ -16,7 +16,7 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp index 7265eeabd5a..0e7197d7822 100644 --- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp +++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp @@ -16,7 +16,7 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h index 1655e0f8847..a75172e8161 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h @@ -29,7 +29,7 @@ public: private: /// Make sure that the current thread has a connection available. - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// The object reference used for this test diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h index 1655e0f8847..a75172e8161 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h +++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h @@ -29,7 +29,7 @@ public: private: /// Make sure that the current thread has a connection available. - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// The object reference used for this test diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp index bcd94b6d1f7..50a9ba7e898 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp @@ -16,7 +16,7 @@ Worker_Thread::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp index b2bf2d2b63d..d20766f2711 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp @@ -12,12 +12,12 @@ Demux_Test_i::Demux_Test_i (void) Demux_Test_i::~Demux_Test_i (void) {} -void Demux_Test_i::M302 (CORBA::Environment &) +void Demux_Test_i::M302 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } -void Demux_Test_i::shutdown (CORBA::Environment &) +void Demux_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORB_Core_instance ()->orb ()->shutdown (); diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h index c6860b5e7cd..ffa9d017ec2 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_i.h +++ b/TAO/performance-tests/POA/Demux/demux_test_i.h @@ -24,15 +24,15 @@ public: // dtor // Return the Default POA of this Servant - PortableServer::POA_ptr _default_POA (CORBA::Environment &/*env*/) + PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return PortableServer::POA::_duplicate (this->poa_.in ()); }; - virtual void M302 (CORBA::Environment &env) + virtual void M302 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &env) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h index 5683e18b1ed..69967f06580 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h +++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h @@ -26,10 +26,10 @@ public: // = The skeleton methods - virtual Test::Simple_ptr create_simple_object (CORBA::Environment &ACE_TRY_ENV) + virtual Test::Simple_ptr create_simple_object (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h index 4f3c7df8c5c..a0a6059ef09 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h +++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h @@ -26,7 +26,7 @@ public: // = The skeleton methods - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp index b1127f11a31..25664e6986d 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp @@ -72,11 +72,11 @@ Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void) } Pluggable_Test_ptr -Pluggable_Test_Factory_i::make_pluggable_test (CORBA::Environment &env) +Pluggable_Test_Factory_i::make_pluggable_test (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START); - return my_pluggable_test_._this (env); + return my_pluggable_test_._this (TAO_ENV_SINGLE_ARG_PARAMETER); } // Constructor @@ -95,7 +95,7 @@ PP_Test_i::~PP_Test_i (void) // Oneway send void -PP_Test_i::send_oneway (CORBA::Environment &) +PP_Test_i::send_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START); @@ -104,7 +104,7 @@ PP_Test_i::send_oneway (CORBA::Environment &) // Twoway send void -PP_Test_i::send_void (CORBA::Environment &) +PP_Test_i::send_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START); @@ -112,7 +112,7 @@ PP_Test_i::send_void (CORBA::Environment &) // Shutdown. -void PP_Test_i::shutdown (CORBA::Environment &) +void PP_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h index 7950a0fb248..2c439e97528 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_i.h +++ b/TAO/performance-tests/Pluggable/PP_Test_i.h @@ -34,15 +34,15 @@ public: ~PP_Test_i (void); // Destructor - virtual void send_oneway (CORBA::Environment &env) + virtual void send_oneway (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test a oneway call. - virtual void send_void (CORBA::Environment &env) + virtual void send_void (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test a twoway call. - virtual void shutdown (CORBA::Environment &env) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown routine. @@ -65,7 +65,7 @@ public: ~Pluggable_Test_Factory_i (void); // Destructor. - virtual Pluggable_Test_ptr make_pluggable_test (CORBA::Environment &env) + virtual Pluggable_Test_ptr make_pluggable_test (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Make a Pluggable Test object. diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h index 1655e0f8847..a75172e8161 100644 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h +++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h @@ -29,7 +29,7 @@ public: private: /// Make sure that the current thread has a connection available. - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// The object reference used for this test diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h index 1655e0f8847..a75172e8161 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h +++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h @@ -29,7 +29,7 @@ public: private: /// Make sure that the current thread has a connection available. - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// The object reference used for this test diff --git a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp index bcd94b6d1f7..50a9ba7e898 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp +++ b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp @@ -16,7 +16,7 @@ Worker_Thread::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h index 6d37f71e9fe..0b557ad4f09 100644 --- a/TAO/performance-tests/Throughput/Receiver_Factory.h +++ b/TAO/performance-tests/Throughput/Receiver_Factory.h @@ -25,10 +25,10 @@ public: Receiver_Factory (CORBA::ORB_ptr orb); // = The skeleton methods - virtual Test::Receiver_ptr create_receiver (CORBA::Environment &ACE_TRY_ENV) + virtual Test::Receiver_ptr create_receiver (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp index 5d60b30dfea..356d29da390 100644 --- a/TAO/tao/Abstract_Servant_Base.cpp +++ b/TAO/tao/Abstract_Servant_Base.cpp @@ -16,12 +16,12 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void) void -TAO_Abstract_ServantBase::_add_ref (CORBA_Environment &) +TAO_Abstract_ServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } void -TAO_Abstract_ServantBase::_remove_ref (CORBA_Environment &) +TAO_Abstract_ServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index 5da19174c53..f924ff1d28a 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -55,20 +55,18 @@ public: int byte_order = TAO_ENCAP_BYTE_ORDER); /// Send request, without blocking until any reply comes back. - virtual int invoke (CORBA_Environment &TAO_IN_ENV = - TAO_default_environment ()) + virtual int invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Establishes a connection to the remote server, initializes /// headers etc. - void start (CORBA_Environment &TAO_IN_ENV = - TAO_default_environment ()) + void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: /// Must be overridden. - virtual int invoke_i (CORBA::Environment &ACE_TRY_ENV) + virtual int invoke_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Reply dispatcher for the current asynchronous invocation. @@ -106,7 +104,7 @@ protected: /// Implementation of the invoke() methods, handles the basic /// send/reply code and the system exceptions. - virtual int invoke_i (CORBA::Environment &ACE_TRY_ENV) + virtual int invoke_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 1a9531c1c27..ad49e49c4fc 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -28,7 +28,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy CORBA::PolicyType -TAO_BidirectionalPolicy::policy_type (CORBA_Environment &) +TAO_BidirectionalPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how this minimizes the @@ -48,7 +48,7 @@ TAO_BidirectionalPolicy::clone (void) const } CORBA::Policy_ptr -TAO_BidirectionalPolicy::copy (CORBA_Environment &ACE_TRY_ENV) +TAO_BidirectionalPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is @@ -64,7 +64,7 @@ TAO_BidirectionalPolicy::copy (CORBA_Environment &ACE_TRY_ENV) } void -TAO_BidirectionalPolicy::destroy (CORBA_Environment &) +TAO_BidirectionalPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -72,7 +72,7 @@ TAO_BidirectionalPolicy::destroy (CORBA_Environment &) BiDirPolicy::BidirectionalPolicyValue TAO_BidirectionalPolicy::value ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException)) { diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 6b018cdc49e..bce1b074dcf 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -63,20 +63,19 @@ public: /// = The BiDir::BidirectionalPolicy methods virtual BiDirPolicy::BidirectionalPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); - virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index 5b8faafea25..6d6465e56db 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -44,7 +44,7 @@ public: void finalize (void); /// Open default resources. - int open_default_resources (CORBA_Environment &ACE_TRY_ENV); + int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown reactor. void shutdown_reactor (void); diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index cdcd7533f31..fc7ad0153e5 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -906,7 +906,7 @@ TAO_IIOP_Acceptor::init_tcp_properties (void) int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size (); int no_delay = this->orb_core_->orb_params ()->nodelay (); - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_TRY_ENV); + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i index f34dc266dd8..2dca45fb2c2 100644 --- a/TAO/tao/Invocation.i +++ b/TAO/tao/Invocation.i @@ -53,7 +53,7 @@ TAO_GIOP_Invocation::received_location_forward (void) const ACE_INLINE void TAO_GIOP_Invocation::init_inconsistent_policies ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->inconsistent_policies_, diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i index 1623cd10b18..b93fd987b7d 100644 --- a/TAO/tao/MProfile.i +++ b/TAO/tao/MProfile.i @@ -253,7 +253,7 @@ TAO_MProfile::add_profile (TAO_Profile *pfile) } ACE_INLINE void -TAO_MProfile::create_policy_list (CORBA::Environment &ACE_TRY_ENV) +TAO_MProfile::create_policy_list (TAO_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->policy_list_, CORBA::PolicyList, diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i index 02b967a4094..29d94e96a7e 100644 --- a/TAO/tao/NVList.i +++ b/TAO/tao/NVList.i @@ -247,9 +247,9 @@ CORBA_NVList::CORBA_NVList (void) } ACE_INLINE CORBA::ULong -CORBA_NVList::count (CORBA_Environment &ACE_TRY_ENV) const +CORBA_NVList::count (TAO_ENV_SINGLE_ARG_DECL) const { - (ACE_const_cast(CORBA_NVList*,this))->evaluate (ACE_TRY_ENV); + (ACE_const_cast(CORBA_NVList*,this))->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->max_; diff --git a/TAO/tao/PortableServer/ImplRepo_i.h b/TAO/tao/PortableServer/ImplRepo_i.h index 2826c555aba..c81aa13f92c 100644 --- a/TAO/tao/PortableServer/ImplRepo_i.h +++ b/TAO/tao/PortableServer/ImplRepo_i.h @@ -41,15 +41,15 @@ public: PortableServer::POA_ptr poa); /// Ping method. - void ping (CORBA::Environment &) + void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (CORBA::Environment &ACE_TRY_ENV) + void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the default POA for this servant. - PortableServer::POA_ptr _default_POA (CORBA::Environment &); + PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); protected: /// Our ORB. We need this member in case we need to shutdown the diff --git a/TAO/tao/PortableServer/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h index a6d4e852dee..5e44a56a7a3 100644 --- a/TAO/tao/PortableServer/MessagingS_T.h +++ b/TAO/tao/PortableServer/MessagingS_T.h @@ -64,9 +64,8 @@ TAO_NAMESPACE POA_Messaging // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + private: T *ptr_; PortableServer::POA_var poa_; diff --git a/TAO/tao/PortableServer/MessagingS_T.i b/TAO/tao/PortableServer/MessagingS_T.i index a395d523643..84f75442fea 100644 --- a/TAO/tao/PortableServer/MessagingS_T.i +++ b/TAO/tao/PortableServer/MessagingS_T.i @@ -90,12 +90,12 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) +POA_Messaging::ReplyHandler_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ReplyHandler::_default_POA (ACE_TRY_ENV); + return this->ReplyHandler::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); } #endif /* ACE_HAS_USING_KEYWORD */ diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp index 5f8d2cc9ad1..e72058e4ad5 100644 --- a/TAO/tao/PortableServer/POA_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Policies.cpp @@ -17,14 +17,14 @@ TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value) } PortableServer::ThreadPolicyValue -TAO_Thread_Policy::value (CORBA::Environment &) +TAO_Thread_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Thread_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy_copy = 0; @@ -37,13 +37,13 @@ TAO_Thread_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Thread_Policy::destroy (CORBA::Environment &) +TAO_Thread_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Thread_Policy::policy_type (CORBA::Environment &) +TAO_Thread_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::THREAD_POLICY_ID; @@ -71,14 +71,14 @@ TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue va } PortableServer::LifespanPolicyValue -TAO_Lifespan_Policy::value (CORBA::Environment &) +TAO_Lifespan_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy_copy = 0; @@ -91,13 +91,13 @@ TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Lifespan_Policy::destroy (CORBA::Environment &) +TAO_Lifespan_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Lifespan_Policy::policy_type (CORBA::Environment &) +TAO_Lifespan_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::LIFESPAN_POLICY_ID; @@ -123,14 +123,14 @@ TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniqueness } PortableServer::IdUniquenessPolicyValue -TAO_Id_Uniqueness_Policy::value (CORBA::Environment &) +TAO_Id_Uniqueness_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0; @@ -143,13 +143,13 @@ TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &) +TAO_Id_Uniqueness_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &) +TAO_Id_Uniqueness_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_UNIQUENESS_POLICY_ID; @@ -175,14 +175,14 @@ TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignment } PortableServer::IdAssignmentPolicyValue -TAO_Id_Assignment_Policy::value (CORBA::Environment &) +TAO_Id_Assignment_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Id_Assignment_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0; @@ -195,13 +195,13 @@ TAO_Id_Assignment_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Id_Assignment_Policy::destroy (CORBA::Environment &) +TAO_Id_Assignment_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &) +TAO_Id_Assignment_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_ASSIGNMENT_POLICY_ID; @@ -229,14 +229,14 @@ TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer:: } PortableServer::ImplicitActivationPolicyValue -TAO_Implicit_Activation_Policy::value (CORBA::Environment &) +TAO_Implicit_Activation_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Implicit_Activation_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0; @@ -249,13 +249,13 @@ TAO_Implicit_Activation_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &) +TAO_Implicit_Activation_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &) +TAO_Implicit_Activation_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; @@ -281,14 +281,14 @@ TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::Serv } PortableServer::ServantRetentionPolicyValue -TAO_Servant_Retention_Policy::value (CORBA::Environment &) +TAO_Servant_Retention_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Servant_Retention_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0; @@ -301,13 +301,13 @@ TAO_Servant_Retention_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Servant_Retention_Policy::destroy (CORBA::Environment &) +TAO_Servant_Retention_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &) +TAO_Servant_Retention_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::SERVANT_RETENTION_POLICY_ID; @@ -333,14 +333,14 @@ TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::Re } PortableServer::RequestProcessingPolicyValue -TAO_Request_Processing_Policy::value (CORBA::Environment &) +TAO_Request_Processing_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy_copy = 0; @@ -353,13 +353,13 @@ TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Request_Processing_Policy::destroy (CORBA::Environment &) +TAO_Request_Processing_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Request_Processing_Policy::policy_type (CORBA::Environment &) +TAO_Request_Processing_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::REQUEST_PROCESSING_POLICY_ID; diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h index c78b5f9b808..4c47630e2d7 100644 --- a/TAO/tao/PortableServer/POA_Policies.h +++ b/TAO/tao/PortableServer/POA_Policies.h @@ -47,16 +47,16 @@ class TAO_PortableServer_Export TAO_Thread_Policy : public: TAO_Thread_Policy (PortableServer::ThreadPolicyValue value); - PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ThreadPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -78,16 +78,16 @@ class TAO_PortableServer_Export TAO_Lifespan_Policy : public: TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value); - PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::LifespanPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -107,16 +107,16 @@ class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy : public: TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value); - PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::IdUniquenessPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -136,16 +136,16 @@ class TAO_PortableServer_Export TAO_Id_Assignment_Policy : public: TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value); - PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::IdAssignmentPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -167,16 +167,16 @@ class TAO_PortableServer_Export TAO_Implicit_Activation_Policy : public: TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value); - PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ImplicitActivationPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -196,16 +196,16 @@ class TAO_PortableServer_Export TAO_Servant_Retention_Policy : public: TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value); - PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ServantRetentionPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -225,16 +225,16 @@ class TAO_PortableServer_Export TAO_Request_Processing_Policy : public: TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value); - PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::RequestProcessingPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index f6a166c157c..2c64e99cf90 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -62,29 +62,25 @@ // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index eff190fd84a..aa13c96f4ef 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -47,7 +47,7 @@ public: void finalize (void); /// Open default resources. - int open_default_resources (CORBA_Environment &ACE_TRY_ENV); + int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown reactor. void shutdown_reactor (void); diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index a2c7d00728e..69d0f11d632 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -551,7 +551,7 @@ TAO_UIOP_Acceptor::init_uiop_properties (void) int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size (); int no_delay = 0; - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_TRY_ENV); + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index d5fbde980b1..54d5da90568 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -48,7 +48,7 @@ public: virtual void finalize (void) = 0; /// Open default resources. - virtual int open_default_resources (CORBA_Environment &ACE_TRY_ENV) = 0; + virtual int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Shutdown reactor. virtual void shutdown_reactor (void) = 0; diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i index ec8b4bd73fb..d6df0851834 100644 --- a/TAO/tao/Typecode.i +++ b/TAO/tao/Typecode.i @@ -48,7 +48,7 @@ CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc { return this->equ_common (tc, 1 - TAO_ENV_ARG_PARAMETER); + TAO_ENV_ARG_PARAMETER); } // Returns true if the two typecodes are identical. @@ -58,7 +58,7 @@ CORBA_TypeCode::equal (CORBA::TypeCode_ptr tc { return this->equ_common (tc, 0 - TAO_ENV_ARG_PARAMETER); + TAO_ENV_ARG_PARAMETER); } // returns the Repository ID diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp index 7c3dc79fc88..58960000cef 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.cpp +++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp @@ -14,7 +14,7 @@ Big_Reply_i::~Big_Reply_i (void) } Test::Octet_Seq * -Big_Reply_i::get_big_reply (CORBA::Environment & /*ACE_TRY_ENV*/) +Big_Reply_i::get_big_reply (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { Test::Octet_Seq_var reply_mesg = @@ -26,13 +26,13 @@ Big_Reply_i::get_big_reply (CORBA::Environment & /*ACE_TRY_ENV*/) } void -Big_Reply_i::ping (CORBA::Environment & /*ACE_TRY_ENV*/) +Big_Reply_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Big_Reply_i::shutdown (CORBA::Environment & /*ACE_TRY_ENV*/) +Big_Reply_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 008646681a3..ab73819e6e3 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -40,13 +40,13 @@ public: virtual ~Big_Reply_i (void); // = The skeleton methods - virtual Test::Octet_Seq *get_big_reply (CORBA::Environment &ACE_TRY_ENV) + virtual Test::Octet_Seq *get_big_reply (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (CORBA::Environment &ACE_TRY_ENV) + virtual void ping (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index cb6bb290542..ff78b52259f 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -31,7 +31,7 @@ Client_Task::svc (void) { for (int i = 0; i != this->event_count_; ++i) { - this->reply_gen_->get_big_reply (ACE_TRY_ENV); + this->reply_gen_->get_big_reply (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -63,7 +63,7 @@ Client_Task::validate_connection (void) ACE_TRY { - this->reply_gen_->ping (ACE_TRY_ENV); + this->reply_gen_->ping (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h index 25fb8267a53..a543a408097 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.h +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -32,7 +32,7 @@ public: private: /// Make sure that all threads have connections available to /// workaround bug 189 - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// Reference to the test interface diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h index 5fa393ab4b7..2222cb5236d 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.h +++ b/TAO/tests/Cache_Growth_Test/Hello.h @@ -25,10 +25,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (CORBA::Environment &ACE_TRY_ENV) + virtual char * get_string (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp index bc057b1d6c6..2e7d2ebc5c8 100644 --- a/TAO/tests/Client_Leaks/Client_Task.cpp +++ b/TAO/tests/Client_Leaks/Client_Task.cpp @@ -30,12 +30,12 @@ Client_Task::svc (void) ACE_TRY { - this->validate_connection (ACE_TRY_ENV); + this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i != this->iterations_; ++i) { - int retval = this->one_iteration (ACE_TRY_ENV); + int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) @@ -65,13 +65,13 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV) +Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { for (int i = 0; i != 100; ++i) { - (void) this->process_factory_->noop (ACE_TRY_ENV); + (void) this->process_factory_->noop (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -84,18 +84,18 @@ Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV) } int -Client_Task::one_iteration (CORBA::Environment &ACE_TRY_ENV) +Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { Test::Process_var process = - this->process_factory_->create_new_process (ACE_TRY_ENV); + this->process_factory_->create_new_process (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - (void) process->get_process_id (ACE_TRY_ENV); + (void) process->get_process_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - process->shutdown (ACE_TRY_ENV); + process->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return 1; diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h index 0b47599a18d..bf1cdcbe900 100644 --- a/TAO/tests/Client_Leaks/Client_Task.h +++ b/TAO/tests/Client_Leaks/Client_Task.h @@ -29,10 +29,10 @@ public: private: /// Run one iteration of the test - int one_iteration (CORBA::Environment &ACE_TRY_ENV); + int one_iteration (TAO_ENV_SINGLE_ARG_DECL); /// Make sure that the thread has a connection available - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// Reference to the test interface diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h index 6185df21a29..e2c74fcf62a 100644 --- a/TAO/tests/Client_Leaks/Process.h +++ b/TAO/tests/Client_Leaks/Process.h @@ -25,10 +25,10 @@ public: Process (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long get_process_id (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Long get_process_id (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h index 728ebb0d8f2..dffc1f930b0 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.h +++ b/TAO/tests/Client_Leaks/Process_Factory.h @@ -28,13 +28,13 @@ public: int shutdown_received (void); // = The skeleton methods - virtual Test::Process_ptr create_new_process (CORBA::Environment &ACE_TRY_ENV) + virtual Test::Process_ptr create_new_process (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)); - virtual void noop (CORBA::Environment &ACE_TRY_ENV) + virtual void noop (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp index 9c8eaa266ad..21935bbec89 100644 --- a/TAO/tests/Client_Leaks/Server_Task.cpp +++ b/TAO/tests/Client_Leaks/Server_Task.cpp @@ -22,7 +22,7 @@ Server_Task::svc (void) { // run the test for at most 120 seconds... // ACE_Time_Value tv (120, 0); - this->orb_->run ( /* tv, */ ACE_TRY_ENV); + this->orb_->run ( /* tv, */ TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp index 204f22da198..149c2aed27b 100644 --- a/TAO/tests/Collocation/Diamond_i.cpp +++ b/TAO/tests/Collocation/Diamond_i.cpp @@ -13,7 +13,7 @@ Top_i::~Top_i () } char * -Top_i::shape (CORBA::Environment &) +Top_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,7 @@ Left_i::~Left_i () } char * -Left_i::shape (CORBA::Environment &) +Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ Left_i::shape (CORBA::Environment &) } char * -Left_i::color (CORBA::Environment &) +Left_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -60,7 +60,7 @@ Right_i::~Right_i () } char * -Right_i::shape (CORBA::Environment &) +Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -69,7 +69,7 @@ Right_i::shape (CORBA::Environment &) } char * -Right_i::color (CORBA::Environment &) +Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,7 @@ Right_i::color (CORBA::Environment &) } CORBA::Long -Right_i::width (CORBA::Environment &) +Right_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -98,7 +98,7 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (CORBA::Environment &) +Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -107,7 +107,7 @@ Buttom_i::shape (CORBA::Environment &) } char * -Buttom_i::color (CORBA::Environment &) +Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -116,7 +116,7 @@ Buttom_i::color (CORBA::Environment &) } CORBA::Long -Buttom_i::width (CORBA::Environment &) +Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -125,7 +125,7 @@ Buttom_i::width (CORBA::Environment &) } char * -Buttom_i::name (CORBA::Environment &) +Buttom_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h index 6aaecc464f3..4d3ba4293b5 100644 --- a/TAO/tests/Collocation/Diamond_i.h +++ b/TAO/tests/Collocation/Diamond_i.h @@ -17,7 +17,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) }; @@ -29,11 +29,11 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (CORBA::Environment &) + virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) }; @@ -45,15 +45,15 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (CORBA::Environment &) + virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (CORBA::Environment &) + virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. }; @@ -65,19 +65,19 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (CORBA::Environment &) + virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (CORBA::Environment &) + virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. - virtual char * name (CORBA::Environment &) + virtual char * name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the name of the object. }; diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp index a1ad06f81ff..db977d4d71c 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp @@ -10,7 +10,7 @@ Oneway_Receiver::Oneway_Receiver (void) } void -Oneway_Receiver::receive_oneway (CORBA::Environment &) +Oneway_Receiver::receive_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h index b5865bc1d98..69eeebf4920 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h @@ -25,7 +25,7 @@ public: Oneway_Receiver (void); // = The skeleton methods - virtual void receive_oneway (CORBA::Environment &ACE_TRY_ENV) + virtual void receive_oneway (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index 637c20c582f..1c716d5ac16 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -10,14 +10,14 @@ Crashed_Callback::Crashed_Callback (void) } CORBA::Boolean -Crashed_Callback::are_you_there (CORBA::Environment &) +Crashed_Callback::are_you_there (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void -Crashed_Callback::crash_now_please (CORBA::Environment &) +Crashed_Callback::crash_now_please (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -33,7 +33,7 @@ Crashed_Callback::crash_now_please (CORBA::Environment &) } void -Crashed_Callback::test_oneway (CORBA::Environment &) +Crashed_Callback::test_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index 8485d3c0c82..cc1b316356b 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -25,13 +25,13 @@ public: Crashed_Callback (void); // = The skeleton methods - virtual CORBA::Boolean are_you_there (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Boolean are_you_there (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void crash_now_please (CORBA::Environment &ACE_TRY_ENV) + virtual void crash_now_please (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void test_oneway (CORBA::Environment &ACE_TRY_ENV) + virtual void test_oneway (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index e4e3d04a920..b0f6ddb293a 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -34,13 +34,11 @@ public: /// Simple two-way operation used to excercise the ORB transport /// internals. - virtual void invoke_me (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the ORB to be shutdown by the shutdown() method in this diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h index 2f4705e16a1..86d504ec72b 100644 --- a/TAO/tests/Explicit_Event_Loop/server.h +++ b/TAO/tests/Explicit_Event_Loop/server.h @@ -26,7 +26,7 @@ class Time_impl : public virtual POA_Time { public: - virtual TimeOfDay get_gmt (CORBA::Environment &) + virtual TimeOfDay get_gmt (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index 216ef07c175..02c51916335 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -21,30 +21,30 @@ Counter_Servant::~Counter_Servant (void) // Counter Interface Methods Implementation. void -Counter_Servant::increment (CORBA::Environment &/*ACE_TRY_ENV*/) +Counter_Servant::increment (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->count_; } CORBA::Long -Counter_Servant::get_count (CORBA::Environment &/*ACE_TRY_ENV*/) +Counter_Servant::get_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->count_; } void -Counter_Servant::reset (CORBA::Environment &/*ACE_TRY_ENV*/) +Counter_Servant::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->count_ = 0; } void -Counter_Servant::shutdown (CORBA::Environment &ACE_TRY_ENV) +Counter_Servant::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->policy_tester_->shutdown (ACE_TRY_ENV); + this->policy_tester_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index 888b72dbc09..2ed503217ea 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -35,20 +35,16 @@ public: // = Counter Interface Methods Overloading. - virtual void increment (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void increment (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_count (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Long get_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void reset (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h index 5fa393ab4b7..2222cb5236d 100644 --- a/TAO/tests/Hello/Hello.h +++ b/TAO/tests/Hello/Hello.h @@ -25,10 +25,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (CORBA::Environment &ACE_TRY_ENV) + virtual char * get_string (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp index 9e0e07db934..11028ad50b5 100644 --- a/TAO/tests/InterOp-Naming/INS_i.cpp +++ b/TAO/tests/InterOp-Naming/INS_i.cpp @@ -24,11 +24,9 @@ INS_i::orb (CORBA::ORB_ptr o) } char * -INS_i::test_ins (CORBA::Environment &env) +INS_i::test_ins (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) { - ACE_UNUSED_ARG (env); - ACE_DEBUG ((LM_DEBUG, "Inside Operation\n")); return CORBA::string_dup ("Success"); diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h index c278b2030f8..6fb278a0c90 100644 --- a/TAO/tests/InterOp-Naming/INS_i.h +++ b/TAO/tests/InterOp-Naming/INS_i.h @@ -33,7 +33,7 @@ public: ~INS_i (void); // Destructor. - char * test_ins (CORBA::Environment &env) + char * test_ins (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); // test the INS. diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp index a9bbc43502e..2485ce0489f 100644 --- a/TAO/tests/LongUpcalls/Controller.cpp +++ b/TAO/tests/LongUpcalls/Controller.cpp @@ -24,7 +24,7 @@ Controller::dump_results () } void -Controller::worker_started (CORBA::Environment &) +Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -34,7 +34,7 @@ Controller::worker_started (CORBA::Environment &) } void -Controller::worker_finished (CORBA::Environment &) +Controller::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index aaefd878e41..1ab48e7c104 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -24,9 +24,9 @@ public: // Print out the results and any errors // = The skeleton methods - virtual void worker_started (CORBA::Environment &ACE_TRY_ENV) + virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (CORBA::Environment &ACE_TRY_ENV) + virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index b8e877722ca..bbf7e7c0709 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (void) } CORBA::Long -Simple_Server_i::remote_call (CORBA::Environment &) +Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -28,7 +28,7 @@ Simple_Server_i::remote_call (CORBA::Environment &) void -Simple_Server_i::shutdown (CORBA::Environment&) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h index f2e2242f70f..f839fd3c6b4 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long remote_call (CORBA::Environment &) + CORBA::Long remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index 27ebda35fb2..9866b7fb3a3 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -15,7 +15,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call (CORBA::Environment &) +Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -24,7 +24,7 @@ Simple_Server_i::remote_call (CORBA::Environment &) void -Simple_Server_i::shutdown (CORBA::Environment&) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h index b704fa70ceb..f55d995e411 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.h +++ b/TAO/tests/MProfile_Forwarding/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (CORBA::Environment &) + void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h index 2c6669ef947..295fe73af56 100644 --- a/TAO/tests/MT_Client/test_i.h +++ b/TAO/tests/MT_Client/test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - void test_method (CORBA::Environment&) + void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h index add5700ce85..8b9ef41cc0e 100644 --- a/TAO/tests/MT_Timeout/Client_Task.h +++ b/TAO/tests/MT_Timeout/Client_Task.h @@ -55,10 +55,10 @@ public: private: /// Run one iteration of the test - int one_iteration (CORBA::Environment &ACE_TRY_ENV); + int one_iteration (TAO_ENV_SINGLE_ARG_DECL); /// Make sure that the thread has a connection available - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// A reference to the ORB diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp index 886e9d81830..0723c2e42f8 100644 --- a/TAO/tests/Multiple/Collocation_Tester.cpp +++ b/TAO/tests/Multiple/Collocation_Tester.cpp @@ -39,7 +39,7 @@ Collocation_Tester::match_answer (const char *actual_answer, } int -Collocation_Tester::test_top (CORBA::Environment &ACE_TRY_ENV) +Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<TOP>-------------------------------\n"))); @@ -58,7 +58,7 @@ Collocation_Tester::test_top (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Top\n\n"))); - CORBA::String_var msg = top->top_quote (ACE_TRY_ENV); + CORBA::String_var msg = top->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); @@ -74,7 +74,7 @@ Collocation_Tester::test_top (CORBA::Environment &ACE_TRY_ENV) } int -Collocation_Tester::test_right (CORBA::Environment &ACE_TRY_ENV) +Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n"))); @@ -93,12 +93,12 @@ Collocation_Tester::test_right (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Right\n\n"))); - CORBA::String_var msg = right->top_quote (ACE_TRY_ENV); + CORBA::String_var msg = right->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = right->right_quote (ACE_TRY_ENV); + msg = right->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); @@ -115,7 +115,7 @@ Collocation_Tester::test_right (CORBA::Environment &ACE_TRY_ENV) int -Collocation_Tester::test_left (CORBA::Environment &ACE_TRY_ENV) +Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<LEFT>-------------------------------\n"))); @@ -135,12 +135,12 @@ Collocation_Tester::test_left (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Left\n\n"))); - CORBA::String_var msg = left->top_quote (ACE_TRY_ENV); + CORBA::String_var msg = left->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = left->left_quote (ACE_TRY_ENV); + msg = left->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); @@ -157,7 +157,7 @@ Collocation_Tester::test_left (CORBA::Environment &ACE_TRY_ENV) int -Collocation_Tester::test_bottom (CORBA::Environment &ACE_TRY_ENV) +Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n"))); @@ -177,22 +177,22 @@ Collocation_Tester::test_bottom (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Bottom\n\n"))); - CORBA::String_var msg = bottom->top_quote (ACE_TRY_ENV); + CORBA::String_var msg = bottom->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = bottom->left_quote (ACE_TRY_ENV); + msg = bottom->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); - msg = bottom->right_quote (ACE_TRY_ENV); + msg = bottom->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); - msg = bottom->bottom_quote (ACE_TRY_ENV); + msg = bottom->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::bottom, msg.in (), "bottom_quote"); @@ -208,7 +208,7 @@ Collocation_Tester::test_bottom (CORBA::Environment &ACE_TRY_ENV) } void -Collocation_Tester::shutdown (CORBA::Environment &ACE_TRY_ENV) +Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL) { Multiple::Top_var top = Multiple::Top::_narrow (this->object_.in ()); @@ -223,23 +223,23 @@ Collocation_Tester::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling ShutDown on Top.\n\n"))); - top->shutdown (ACE_TRY_ENV); + top->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Collocation_Tester::run (CORBA::Environment &ACE_TRY_ENV) +Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL) { - int failure_num = this->test_top (ACE_TRY_ENV); + int failure_num = this->test_top (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_left (ACE_TRY_ENV); + failure_num += this->test_left (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_right (ACE_TRY_ENV); + failure_num += this->test_right (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_bottom (ACE_TRY_ENV); + failure_num += this->test_bottom (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (failure_num) @@ -249,5 +249,5 @@ Collocation_Tester::run (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nThe Test Completed Successfully. Congratulations! "))); - this->shutdown (ACE_TRY_ENV); + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h index cfb24b1e39d..766242232bc 100644 --- a/TAO/tests/Multiple/Collocation_Tester.h +++ b/TAO/tests/Multiple/Collocation_Tester.h @@ -39,7 +39,7 @@ public: ~Collocation_Tester (); // -- Command -- - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Runs the test. @@ -47,19 +47,19 @@ private: // -- Helper Methods -- - int test_top (CORBA::Environment &ACE_TRY_ENV); + int test_top (TAO_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Top interface. - int test_right (CORBA::Environment &ACE_TRY_ENV); + int test_right (TAO_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Right interface. - int test_left (CORBA::Environment &ACE_TRY_ENV); + int test_left (TAO_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Left interface. - int test_bottom (CORBA::Environment &ACE_TRY_ENV); + int test_bottom (TAO_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Bottom interface. @@ -72,7 +72,7 @@ private: // is no match (actually 1 is returned if there is // no match. - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); private: CORBA::Object_var object_; }; diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index d66c87ed192..e0a563896bc 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -40,27 +40,27 @@ public: virtual ~Bottom_Impl (void); // IDL Interface Methods - virtual char * top_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -89,24 +89,24 @@ public: virtual ~Delegated_Bottom_Impl (void); // IDL Interface Methods. - virtual char * top_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (CORBA::Environment &ACE_TRY_ENV) + virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index f294aa2172b..87e8cbe8611 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -9,22 +9,22 @@ class Multiple_Inheritance_i : public POA_D public: Multiple_Inheritance_i (void); - virtual char* method1 (CORBA::Environment &) + virtual char* method1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method1"); } - virtual char* method2 (CORBA::Environment &) + virtual char* method2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method2"); } - virtual char* method3 (CORBA::Environment &) + virtual char* method3 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method3"); } - virtual char* method4 (CORBA::Environment &) + virtual char* method4 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method4"); diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp index 29103ecc612..5cd7c837c6b 100644 --- a/TAO/tests/Native_Exceptions/client.cpp +++ b/TAO/tests/Native_Exceptions/client.cpp @@ -89,7 +89,7 @@ main (int argc, char *argv[]) } catch (CORBA::SystemException &ex) { - ACE_PRINT_EXCEPTION (ex, "Catched exception:"); + ACE_PRINT_EXCEPTION (ex, "Caught exception:"); return 1; } diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp index cae2e7d2570..8de43cfbbf1 100644 --- a/TAO/tests/Native_Exceptions/server.cpp +++ b/TAO/tests/Native_Exceptions/server.cpp @@ -84,7 +84,7 @@ main (int argc, char *argv[]) } catch (CORBA::SystemException &ex) { - ACE_PRINT_EXCEPTION (ex, "Catched exception:"); + ACE_PRINT_EXCEPTION (ex, "Caught exception:"); return 1; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index cd7cace945f..ab5133bbb28 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -35,7 +35,7 @@ public: virtual ~Initiator_i (void); // Destructor. - virtual void foo_object_B (CORBA::Environment &env) + virtual void foo_object_B (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index 06ecfd828b7..4c9a9ad70d3 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -37,13 +37,13 @@ public: Test_i (PortableServer::POA_ptr poa); // ctor - CORBA::Long instance_count (CORBA::Environment &) + CORBA::Long instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA::Environment &) + void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (CORBA::Environment &) + PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index 9f4e8c8f0ff..a615bc0fa09 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -19,20 +19,20 @@ Receiver_i::~Receiver_i (void) CORBA::Long -Receiver_i::receive_call (CORBA::Environment &ACE_TRY_ENV) +Receiver_i::receive_call (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Doing a ping... \n")); - this->sender_->ping (ACE_TRY_ENV); + this->sender_->ping (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return this->no_calls_++; } CORBA::Long -Receiver_i::get_call_count (CORBA::Environment & /*ACE_TRY_ENV*/) +Receiver_i::get_call_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->iteration_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 4293dac976b..bc133c6d926 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -41,11 +41,11 @@ public: virtual ~Receiver_i (void); // = The skeleton methods - virtual CORBA::Long receive_call (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Long receive_call (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Retun the number of calls that every thread would make... - virtual CORBA::Long get_call_count (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Long get_call_count (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 261f380aba6..04ef8b96d8e 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -37,13 +37,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Short number (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index 693d577b31b..2309de5d64b 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -34,8 +34,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index 598bdfba9a8..ed0f81b6c2d 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -38,13 +38,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual void invoke_me (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp index 57fc83eae65..a9e5723dc47 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -25,7 +25,6 @@ void Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; CORBA::ULong s_count = this->starting_interception_point_count_.value (); diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h index 5aa895838e3..0dba48dc0e8 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h @@ -25,13 +25,13 @@ public: Oneway_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void raise_no_permission (CORBA::Environment &ACE_TRY_ENV) + virtual void raise_no_permission (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Test::Shutdown_Helper_ptr get_shutdown_helper (CORBA::Environment &ACE_TRY_ENV) + virtual Test::Shutdown_Helper_ptr get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h index 4de5df9dbf8..09ee8bba3fa 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h @@ -25,7 +25,7 @@ public: Shutdown_Helper (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h index dfdb8d89e14..728a5e6def7 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.h +++ b/TAO/tests/Server_Leaks/Ping_Service.h @@ -25,10 +25,10 @@ public: Ping_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void ping (CORBA::Environment &ACE_TRY_ENV) + virtual void ping (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp index 4eca173bdfe..df102e638a8 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp @@ -13,7 +13,7 @@ Top_i::~Top_i () } char * -Top_i::shape (CORBA::Environment &) +Top_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,7 @@ Left_i::~Left_i () } char * -Left_i::shape (CORBA::Environment &) +Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ Left_i::shape (CORBA::Environment &) } char * -Left_i::color (CORBA::Environment &) +Left_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -60,7 +60,7 @@ Right_i::~Right_i () } char * -Right_i::shape (CORBA::Environment &) +Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -69,7 +69,7 @@ Right_i::shape (CORBA::Environment &) } char * -Right_i::color (CORBA::Environment &) +Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,7 @@ Right_i::color (CORBA::Environment &) } CORBA::Long -Right_i::width (CORBA::Environment &) +Right_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -98,7 +98,7 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (CORBA::Environment &) +Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -107,7 +107,7 @@ Buttom_i::shape (CORBA::Environment &) } char * -Buttom_i::color (CORBA::Environment &) +Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -116,7 +116,7 @@ Buttom_i::color (CORBA::Environment &) } CORBA::Long -Buttom_i::width (CORBA::Environment &) +Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -125,7 +125,7 @@ Buttom_i::width (CORBA::Environment &) } char * -Buttom_i::name (CORBA::Environment &) +Buttom_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h index d5e05acf379..3b4540e57e9 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h @@ -16,7 +16,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char* shape (CORBA::Environment &) + virtual char* shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) }; @@ -28,11 +28,11 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (CORBA::Environment &) + virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) }; @@ -44,15 +44,15 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (CORBA::Environment &) + virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (CORBA::Environment &) + virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. }; @@ -64,19 +64,19 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (CORBA::Environment &) + virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (CORBA::Environment &) + virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (CORBA::Environment &) + virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. - virtual char * name (CORBA::Environment &) + virtual char * name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the name of the object. }; diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index e220a9ccd81..996a0e588d4 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -10,7 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) Test_ptr Smart_Test_Factory::create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL) + TAO_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp index e9c74c69fdd..8c9c75ef9b1 100644 --- a/TAO/tests/Strategies/simple_test_i.cpp +++ b/TAO/tests/Strategies/simple_test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(tests, simple_test_i, "$Id$") CORBA::Boolean -Simple_Server_i::print_status (CORBA::Environment&) +Simple_Server_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -20,7 +20,7 @@ Simple_Server_i::print_status (CORBA::Environment&) } void -Simple_Server_i::shutdown (CORBA::Environment&) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h index 95215ae32cd..f58ecb402d5 100644 --- a/TAO/tests/Strategies/simple_test_i.h +++ b/TAO/tests/Strategies/simple_test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean print_status (CORBA::Environment&) + CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp index 21acce664fb..4b42f8473db 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.cpp +++ b/TAO/tests/Xt_Stopwatch/test_i.cpp @@ -17,21 +17,21 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer) } void -Stopwatch_imp::start (CORBA::Environment&) +Stopwatch_imp::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->start (); } void -Stopwatch_imp::stop (CORBA::Environment&) +Stopwatch_imp::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->stop (); } void -Stopwatch_imp::shutdown (CORBA::Environment&) +Stopwatch_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h index e3faf1830d1..550d3c2390d 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.h +++ b/TAO/tests/Xt_Stopwatch/test_i.h @@ -34,13 +34,13 @@ public: // ctor // = The Simple_Server methods. - void start (CORBA::Environment&) + void start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void stop (CORBA::Environment&) + void stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: |