diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tests/Param_Test | |
| parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
| download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tests/Param_Test')
80 files changed, 902 insertions, 899 deletions
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 045c618c27c..e12c722c98f 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -48,7 +48,7 @@ Test_Any::opname (void) const } void -Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV) +Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) { req->add_in_arg ("o1") <<= this->in_; req->add_inout_arg ("o2") <<= this->inout_; @@ -56,7 +56,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV) req->set_return_type (CORBA::_tc_any); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -64,13 +64,13 @@ Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV) this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); @@ -92,13 +92,13 @@ static const CORBA::TypeCode_ptr any_table [] = #endif /* any_table isn't currently used */ int -Test_Any::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Any::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (ACE_TRY_ENV); + this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -269,15 +269,15 @@ Test_Any::reset_parameters (void) } int -Test_Any::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Any::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_any (this->in_, this->inout_, - this->out_.out (), - ACE_TRY_ENV); + this->out_.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index 921aa359526..713b16b4193 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -47,15 +47,15 @@ public: ANY_LAST_TEST_ITEM }; - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -70,7 +70,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index 5f142364b7a..ea71d452ae1 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -32,8 +32,8 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Get_Opt get_opt (argc, argv, "dn:l:"); @@ -90,13 +90,13 @@ main (int argc, char *argv[]) { CORBA::Object_var obj = - orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar", - ACE_TRY_ENV); + orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Param_Test_var param_test = - Param_Test::_unchecked_narrow (obj.in (), - ACE_TRY_ENV); + Param_Test::_unchecked_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_Stub *stub = param_test->_stubobj (); stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0"); @@ -110,7 +110,7 @@ main (int argc, char *argv[]) "Cannot extract Param_Test (oh the horror)\n")); } CORBA::Boolean equiv = - param_test->_is_equivalent (o, ACE_TRY_ENV); + param_test->_is_equivalent (o TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!equiv) { diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index c19db80d81b..1b7edb51d8e 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -48,15 +48,15 @@ Test_Bounded_Array_Sequence::opname (void) const } void -Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_ArraySeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_ArraySeq *tmp; @@ -64,21 +64,21 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_ArraySeq (*tmp); } int -Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -123,8 +123,8 @@ Test_Bounded_Array_Sequence::reset_parameters (void) } int -Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -133,8 +133,8 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_array_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h index 411cf0ec1e1..23d342214a9 100644 --- a/TAO/tests/Param_Test/bd_array_seq.h +++ b/TAO/tests/Param_Test/bd_array_seq.h @@ -34,15 +34,15 @@ public: ~Test_Bounded_Array_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,8 +57,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index eea7c524c9c..a32c2d50f10 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -47,15 +47,15 @@ Test_Bounded_Long_Sequence::opname (void) const } void -Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_Long_Seq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_Long_Seq *tmp; @@ -63,21 +63,21 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_Long_Seq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Long_Seq (*tmp); } int -Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { // get some sequence length (32 in this case) CORBA::ULong len = this->in_->maximum (); @@ -114,16 +114,16 @@ Test_Bounded_Long_Sequence::reset_parameters (void) } int -Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { Param_Test::Bounded_Long_Seq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_long_sequence (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index 5dda51d2268..0809eb53f40 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -34,15 +34,15 @@ public: ~Test_Bounded_Long_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 8d585809a4a..21836ba0f74 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -47,15 +47,15 @@ Test_Bounded_Short_Sequence::opname (void) const } void -Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_Short_Seq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_Short_Seq *tmp; @@ -63,24 +63,23 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_Short_Seq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Short_Seq (*tmp); } int -Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/, - CORBA::Environment & /*env*/) +Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/ + TAO_ENV_ARG_DECL_NOT_USED /*env*/) { // ACE_UNUSED_ARG (objref); - // ACE_UNUSED_ARG (env); // get some sequence length (32 in this case) CORBA::ULong len = this->in_->maximum (); @@ -119,8 +118,8 @@ Test_Bounded_Short_Sequence::reset_parameters (void) } int -Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -128,8 +127,8 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_short_sequence (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index 5efe29e22a6..54831453981 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -34,15 +34,15 @@ public: ~Test_Bounded_Short_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index bd9aae472bd..3df97b029d1 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -47,8 +47,8 @@ Test_Bounded_String_Sequence::opname (void) const } void -Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Bounded_StrSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_StrSeq *tmp; @@ -64,21 +64,21 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StrSeq (*tmp); } int -Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { const char *choiceList[] = { @@ -111,8 +111,8 @@ Test_Bounded_String_Sequence::reset_parameters (void) } int -Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -120,8 +120,8 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_strseq (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index 48b60f9366b..9b6d776d2d0 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -34,15 +34,15 @@ public: ~Test_Bounded_String_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index aa2a1418189..88bce95539d 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -55,8 +55,8 @@ Test_Bounded_String::opname (void) const } void -Test_Bounded_String::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_String::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= CORBA::Any::from_string (this->in_, 128); req->add_inout_arg ("s2") <<= CORBA::Any::from_string (this->inout_, 128); @@ -67,7 +67,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_short_string); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; char *tmp; @@ -75,21 +75,21 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req, this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= CORBA::Any::to_string (tmp, 128); this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= CORBA::Any::to_string (tmp, 128); this->out_ = CORBA::string_dup (tmp); } int -Test_Bounded_String::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Bounded_String::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,8 +124,8 @@ Test_Bounded_String::reset_parameters (void) } int -Test_Bounded_String::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_String::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -133,8 +133,8 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_string (this->in_, this->inout_, - str_out, - ACE_TRY_ENV); + str_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index 46291917900..444ec8df45a 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -33,15 +33,15 @@ public: ~Test_Bounded_String (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index 4671053d08f..3666187016c 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -50,15 +50,15 @@ Test_Bounded_Struct_Sequence::opname (void) const } void -Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_StructSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_StructSeq *tmp; @@ -66,21 +66,21 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StructSeq (*tmp); } int -Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */, - CORBA::Environment & /* env */) +Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */ + TAO_ENV_ARG_DECL_NOT_USED /* env */) { Generator *gen = GENERATOR::instance (); // value generator @@ -116,8 +116,8 @@ Test_Bounded_Struct_Sequence::reset_parameters (void) } int -Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -125,8 +125,8 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_struct_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index a8ce07bd760..d06ff51c1c8 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -34,15 +34,15 @@ public: ~Test_Bounded_Struct_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index 2ba77400d20..a0b9ae9d756 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -47,8 +47,8 @@ Test_Bounded_WString_Sequence::opname (void) const } void -Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Bounded_WStrSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_WStrSeq *tmp; @@ -64,21 +64,21 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_WStrSeq (*tmp); } int -Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -93,7 +93,7 @@ Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr , { this->in_[i] = gen->gen_wstring (); - // different from in_ + // different from in_ this->inout_[i] = gen->gen_wstring (); } @@ -110,8 +110,8 @@ Test_Bounded_WString_Sequence::reset_parameters (void) } int -Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -119,8 +119,8 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_wstrseq (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h index 108d53a4057..83c00d2f8a5 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.h +++ b/TAO/tests/Param_Test/bd_wstr_seq.h @@ -34,15 +34,15 @@ public: ~Test_Bounded_WString_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,8 +57,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index 5c02052a481..3100895a2b7 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -55,8 +55,8 @@ Test_Bounded_WString::opname (void) const } void -Test_Bounded_WString::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_WString::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= CORBA::Any::from_wstring (this->in_, 128); req->add_inout_arg ("s2") <<= CORBA::Any::from_wstring (this->inout_, 128); @@ -67,7 +67,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_short_wstring); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::WChar *tmp; @@ -75,21 +75,21 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req, this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= CORBA::Any::to_wstring (tmp, 128); this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128); this->out_ = CORBA::wstring_dup (tmp); } int -Test_Bounded_WString::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Bounded_WString::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,8 +124,8 @@ Test_Bounded_WString::reset_parameters (void) } int -Test_Bounded_WString::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_WString::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -133,8 +133,8 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_wstring (this->in_, this->inout_, - str_out, - ACE_TRY_ENV); + str_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h index 8e864ce6f32..8a54c8df633 100644 --- a/TAO/tests/Param_Test/bd_wstring.h +++ b/TAO/tests/Param_Test/bd_wstring.h @@ -33,15 +33,15 @@ public: ~Test_Bounded_WString (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,8 +56,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index c91ebfdb755..0cb0f5589af 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -45,8 +45,8 @@ Test_Big_Union::opname (void) const } void -Test_Big_Union::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Big_Union::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -54,7 +54,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Big_Union); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Big_Union *tmp; @@ -62,26 +62,26 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Big_Union (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Big_Union (*tmp); } int -Test_Big_Union::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Big_Union::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (ACE_TRY_ENV); + this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -228,15 +228,15 @@ Test_Big_Union::reset_parameters (void) } int -Test_Big_Union::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Big_Union::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_big_union (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -286,7 +286,7 @@ Test_Big_Union::check_validity (void) break; case 1: { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { Coffee_ptr in = this->in_.the_interface (); @@ -301,16 +301,16 @@ Test_Big_Union::check_validity (void) return 0; Coffee::Desc_var in_desc = - in->description (ACE_TRY_ENV); + in->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var inout_desc = - inout->description (ACE_TRY_ENV); + inout->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var out_desc = - out->description (ACE_TRY_ENV); + out->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var ret_desc = - ret->description (ACE_TRY_ENV); + ret->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (in_desc->name.in (), diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h index e92b00b0046..08e5a702396 100644 --- a/TAO/tests/Param_Test/big_union.h +++ b/TAO/tests/Param_Test/big_union.h @@ -37,15 +37,15 @@ public: BIG_UNION_N_BRANCHES = 12 }; - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -60,7 +60,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 1b62f5ffd33..3fe60d6cd70 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -65,10 +65,10 @@ Param_Test_Client<T>::run_sii_test (void) this->results_.iterations (opt->loop_count ()); // Declare the Env - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; // Initialize parameters for the test. - int check = this->test_object_->init_parameters (this->param_test_, - ACE_TRY_ENV); + int check = this->test_object_->init_parameters (this->param_test_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check == -1) @@ -97,8 +97,8 @@ Param_Test_Client<T>::run_sii_test (void) this->results_.start_timer (); // make the call - this->test_object_->run_sii_test (this->param_test_, - ACE_TRY_ENV); + this->test_object_->run_sii_test (this->param_test_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // stop the timer. @@ -178,10 +178,10 @@ Param_Test_Client<T>::run_dii_test (void) this->results_.iterations (opt->loop_count ()); // Environment variable - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; // initialize parameters for the test - int check = this->test_object_->init_parameters (this->param_test_, - ACE_TRY_ENV); + int check = this->test_object_->init_parameters (this->param_test_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check == -1) @@ -207,8 +207,8 @@ Param_Test_Client<T>::run_dii_test (void) ACE_TRY { - req = this->param_test_->_request (opname, - ACE_TRY_ENV); + req = this->param_test_->_request (opname + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (opt->debug ()) @@ -218,8 +218,8 @@ Param_Test_Client<T>::run_dii_test (void) } // Make the invocation, verify the result. - this->test_object_->dii_req_invoke (req.in (), - ACE_TRY_ENV); + this->test_object_->dii_req_invoke (req.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index d3050e2852e..d3d621880fe 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -51,8 +51,8 @@ Test_Complex_Any::opname (void) const } void -Test_Complex_Any::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Complex_Any::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -60,7 +60,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req, req->set_return_type (CORBA::_tc_any); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -68,21 +68,21 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req, this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); } int -Test_Complex_Any::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Complex_Any::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { return this->reset_parameters (); } @@ -167,15 +167,15 @@ Test_Complex_Any::reset_parameters (void) } int -Test_Complex_Any::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Complex_Any::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_complex_any (this->in_, this->inout_, - this->out_.out (), - ACE_TRY_ENV); + this->out_.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h index 026d441ab22..088e9fdeea7 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -33,15 +33,15 @@ public: ~Test_Complex_Any (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index 645cf856148..cac0b11e525 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -61,8 +61,7 @@ int Driver::init (int argc, char **argv) { // environment to track exceptions - ACE_DECLARE_NEW_CORBA_ENV; - //CORBA::Environment env; + TAO_ENV_DECLARE_NEW_ENV; // retrieve the instance of Options Options *opt = OPTIONS::instance (); @@ -76,8 +75,8 @@ Driver::init (int argc, char **argv) // Retrieve the underlying ORB this->orb_ = CORBA::ORB_init (argc, argv, - "internet", - ACE_TRY_ENV); + "internet" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -90,7 +89,7 @@ Driver::init (int argc, char **argv) ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed."); CORBA::Object_var temp = - this->orb_->string_to_object (opt->param_test_ior (), ACE_TRY_ENV); + this->orb_->string_to_object (opt->param_test_ior () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -103,7 +102,7 @@ Driver::init (int argc, char **argv) // Get the object reference ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed."); - this->objref_ = Param_Test::_narrow (temp.in(), ACE_TRY_ENV); + this->objref_ = Param_Test::_narrow (temp.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -614,12 +613,12 @@ Driver::run (void) } // Get in a new environment variable - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { if (opt->shutdown ()) { - this->objref_->shutdown (ACE_TRY_ENV); + this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index eec0aa7823f..5d2b8a77165 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -47,8 +47,8 @@ Test_Exception::opname (void) const } void -Test_Exception::dii_req_invoke (CORBA::Request_ptr req, - CORBA::Environment &ACE_TRY_ENV) +Test_Exception::dii_req_invoke (CORBA::Request_ptr req + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -61,18 +61,18 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req, req->exceptions ()->add (CORBA::TypeCode::_duplicate (Param_Test::_tc_Ooops)); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } @@ -131,8 +131,8 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req, } int -Test_Exception::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Exception::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -151,16 +151,16 @@ Test_Exception::reset_parameters (void) } int -Test_Exception::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Exception::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->in_++; this->ret_ = objref->test_exception (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Param_Test::Ooops, ex) diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h index fb85e1d71cc..ba7c1d9260a 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -30,15 +30,15 @@ public: ~Test_Exception (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -53,7 +53,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index cad9afe1d72..b34cdbd5e46 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -44,15 +44,15 @@ Test_Fixed_Array::opname (void) const } void -Test_Fixed_Array::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Fixed_Array::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= Param_Test::Fixed_Array_forany (this->in_); req->add_inout_arg ("s2") <<= Param_Test::Fixed_Array_forany (this->inout_); req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_); req->set_return_type (Param_Test::_tc_Fixed_Array); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Array_forany forany; @@ -60,13 +60,13 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req, Param_Test::Fixed_Array_copy (this->ret_, forany.in ()); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= forany; Param_Test::Fixed_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Array_forany out_any (this->out_); *arg3->value () >>= forany; @@ -74,13 +74,12 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req, } int -Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/, - CORBA::Environment &/*env*/) +Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/ + TAO_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator //ACE_UNUSED_ARG (objref); - //ACE_UNUSED_ARG (env); for (CORBA::ULong i=0; i < Param_Test::DIM1; i++) { @@ -107,15 +106,15 @@ Test_Fixed_Array::reset_parameters (void) } int -Test_Fixed_Array::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Fixed_Array::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_fixed_array (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index 51cb8d1753d..c885b66f58e 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -33,15 +33,15 @@ public: ~Test_Fixed_Array (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index d185f868fe0..46e87cc5b66 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -43,15 +43,15 @@ Test_Fixed_Struct::opname (void) const } void -Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; req->add_out_arg ("s3") <<= this->out_; req->set_return_type (Param_Test::_tc_Fixed_Struct); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Struct *tmp; @@ -59,26 +59,25 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req, this->ret_ = *tmp; CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = *tmp; } int -Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/, - CORBA::Environment &/*env*/) +Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/ + TAO_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator //ACE_UNUSED_ARG (objref); - //ACE_UNUSED_ARG (env); this->in_ = gen->gen_fixed_struct (); ACE_OS::memset (&this->inout_, @@ -106,15 +105,15 @@ Test_Fixed_Struct::reset_parameters (void) } int -Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_fixed_struct (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index 81ec824b4a7..aeef44761a5 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -33,15 +33,15 @@ public: ~Test_Fixed_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp index b17e6e302b2..6dd783bf1e5 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -46,8 +46,8 @@ Test_Multdim_Array::opname (void) const } void -Test_Multdim_Array::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Multdim_Array::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= Param_Test::Multdim_Array_forany (this->in_.inout ()); req->add_inout_arg ("s2") <<= Param_Test::Multdim_Array_forany (this->inout_.inout ()); @@ -55,7 +55,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Multdim_Array); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -64,21 +64,21 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req, Param_Test::Multdim_Array_copy (this->ret_, forany.in ()); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= forany; Param_Test::Multdim_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= forany; Param_Test::Multdim_Array_copy (this->out_, forany.in ()); } int -Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/, - CORBA::Environment &/*env*/) +Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/ + TAO_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -133,14 +133,25 @@ Test_Multdim_Array::reset_parameters (void) } int -Test_Multdim_Array::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Multdim_Array::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { - this->ret_ = objref->test_multdim_array (this->in_.in (), - this->inout_.inout (), - this->out_.inout (), - ACE_TRY_ENV); - return (ACE_TRY_ENV.exception () ? -1:0); + ACE_TRY + { + this->ret_ = objref->test_multdim_array (this->in_.in (), + this->inout_.inout (), + this->out_.inout () + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + return 0; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Test_Multdim_Array::run_sii_test\n"); + } + ACE_ENDTRY; + return -1; } CORBA::Boolean diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h index 2f8afdce885..65f04d5b2f5 100644 --- a/TAO/tests/Param_Test/multdim_array.h +++ b/TAO/tests/Param_Test/multdim_array.h @@ -33,15 +33,15 @@ public: ~Test_Multdim_Array (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index 0bb1ad2adba..022c4fb538f 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -48,14 +48,14 @@ Test_Nested_Struct::opname (void) const } void -Test_Nested_Struct::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV) +Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Nested_Struct); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Nested_Struct *tmp; @@ -63,21 +63,21 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE this->ret_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Nested_Struct (*tmp); } int -Test_Nested_Struct::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Nested_Struct::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -130,16 +130,16 @@ Test_Nested_Struct::reset_parameters (void) } int -Test_Nested_Struct::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Nested_Struct::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { Param_Test::Nested_Struct_out out (this->out_.out ()); this->ret_ = objref->test_nested_struct (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index cbd260906ab..c90edc3a437 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -34,15 +34,15 @@ public: ~Test_Nested_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 9ef81ab4216..128959dfed3 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -43,8 +43,8 @@ Test_ObjRef::opname (void) const } void -Test_ObjRef::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_ObjRef::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -52,7 +52,7 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req, req->set_return_type (_tc_Coffee); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Coffee_ptr tmp; @@ -60,13 +60,13 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req, this->ret_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = Coffee::_duplicate (tmp); @@ -82,13 +82,12 @@ static const char *Coffee_Flavor [] = { }; int -Test_ObjRef::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_ObjRef::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator - // New environment variable char msg_str[256] = ""; ACE_TRY @@ -96,7 +95,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref, ACE_OS::strcpy (msg_str, "make_cofee"); // first get a Coffee object - this->in_ = objref->make_coffee (ACE_TRY_ENV); + this->in_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get some index into Coffee_Flavor []. @@ -105,7 +104,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref, // set the attribute of the object ACE_OS::strcpy (msg_str, "set coffee attribute"); - this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object + this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object ACE_TRY_CHECK; this->inout_ = Coffee::_nil (); @@ -126,8 +125,7 @@ int Test_ObjRef::reset_parameters (void) { // Environemnt variable - ACE_DECLARE_NEW_CORBA_ENV; - //CORBA::Environment env; + TAO_ENV_DECLARE_NEW_ENV; Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -138,7 +136,7 @@ Test_ObjRef::reset_parameters (void) ACE_TRY { // set the attribute of the object - this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object + this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object ACE_TRY_CHECK; } ACE_CATCHANY @@ -156,8 +154,8 @@ Test_ObjRef::reset_parameters (void) } int -Test_ObjRef::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_ObjRef::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -165,8 +163,8 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_objref (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -185,7 +183,7 @@ CORBA::Boolean Test_ObjRef::check_validity (void) { // Environemnt variable - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -195,24 +193,24 @@ Test_ObjRef::check_validity (void) || CORBA::is_nil (this->ret_.in ())) return 0; Coffee::Desc_var in_desc = - this->in_->description (ACE_TRY_ENV); + this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (ACE_TRY_ENV); + this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (ACE_TRY_ENV); + this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *out = out_desc->name.in (); - Coffee::Desc_var ret_desc = this->out_->description (ACE_TRY_ENV); + Coffee::Desc_var ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char* ret = ret_desc->name.in (); @@ -242,10 +240,8 @@ Test_ObjRef::check_validity (CORBA::Request_ptr) void Test_ObjRef::print_values (void) { - // CORBA::Environment env; - // Env. variable - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; Coffee::Desc_var ret_desc; const char *in = 0; @@ -254,23 +250,23 @@ Test_ObjRef::print_values (void) ACE_TRY { Coffee::Desc_var in_desc = - this->in_->description (ACE_TRY_ENV); + this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (ACE_TRY_ENV); + this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (ACE_TRY_ENV); + this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out = out_desc->name.in (); - ret_desc = this->out_->description (ACE_TRY_ENV); + ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index 459f26a1ecc..77e9c0baa68 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -33,15 +33,15 @@ public: ~Test_ObjRef (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index ef38d4054f4..4489417361f 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -48,8 +48,8 @@ Test_Objref_Struct::opname (void) const } void -Test_Objref_Struct::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Objref_Struct::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -57,7 +57,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Objref_Struct); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Objref_Struct *tmp; @@ -65,21 +65,21 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Objref_Struct (*tmp); } int -Test_Objref_Struct::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Objref_Struct::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -88,22 +88,22 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref, // Set the long member. this->in_.x = gen->gen_long (); - this->in_.y = objref->make_coffee (ACE_TRY_ENV); + this->in_.y = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc d; d.name = gen->gen_string (); - this->in_.y->description (d, - ACE_TRY_ENV); + this->in_.y->description (d + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->inout_->x = 0; + this->inout_->x = 0; - this->inout_->y = Coffee::_nil (); + this->inout_->y = Coffee::_nil (); Coffee::Desc dd; - dd.name = CORBA::string_dup (""); + dd.name = CORBA::string_dup (""); return 0; } @@ -124,19 +124,19 @@ Test_Objref_Struct::reset_parameters (void) this->out_ = new Param_Test::Objref_Struct; this->ret_ = new Param_Test::Objref_Struct; - this->inout_->x = 0; + this->inout_->x = 0; - this->inout_->y = Coffee::_nil (); + this->inout_->y = Coffee::_nil (); Coffee::Desc dd; - dd.name = CORBA::string_dup (""); + dd.name = CORBA::string_dup (""); return 0; } int -Test_Objref_Struct::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Objref_Struct::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -144,8 +144,8 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_objref_struct (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -168,7 +168,7 @@ Test_Objref_Struct::check_validity (void) || this->in_.x != this->ret_->x) return 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -180,16 +180,16 @@ Test_Objref_Struct::check_validity (void) return 0; } - Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV); + Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV); + Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV); + Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV); + Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (s_in->name, s_out->name) != 0 @@ -231,21 +231,21 @@ Test_Objref_Struct::print_values (void) this->out_->x, this->ret_->x )); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV); + Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV); + Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV); + Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV); + Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h index 5ded88f67c5..e1c684a39c6 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -34,15 +34,15 @@ public: ~Test_Objref_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 0ffcbd5365d..689e66c5c81 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -35,7 +35,7 @@ Coffee_i::~Coffee_i (void) // get attribute Coffee::Desc * -Coffee_i::description (CORBA::Environment & /*env*/) +Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee::Desc *desc = new Coffee::Desc; @@ -45,8 +45,8 @@ Coffee_i::description (CORBA::Environment & /*env*/) // set attribute void -Coffee_i::description (const Coffee::Desc &description, - CORBA::Environment & /*env*/) +Coffee_i::description (const Coffee::Desc &description + TAO_ENV_ARG_DECL_NOT_USED /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (description.name); @@ -74,8 +74,8 @@ Param_Test_i::~Param_Test_i (void) CORBA::Short Param_Test_i::test_short (CORBA::Short s1, CORBA::Short &s2, - CORBA::Short_out s3, - CORBA::Environment &) + CORBA::Short_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = (CORBA::Short) (s1 * 2); @@ -93,8 +93,8 @@ Param_Test_i::test_short (CORBA::Short s1, CORBA::ULongLong Param_Test_i::test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, - CORBA::ULongLong_out s3, - CORBA::Environment &) + CORBA::ULongLong_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; @@ -108,8 +108,8 @@ Param_Test_i::test_ulonglong (CORBA::ULongLong s1, char * Param_Test_i::test_unbounded_string (const char *s1, char *&s2, - CORBA::String_out s3, - CORBA::Environment &) + CORBA::String_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -127,8 +127,8 @@ Param_Test_i::test_unbounded_string (const char *s1, char * Param_Test_i::test_bounded_string (const char *s1, char *&s2, - CORBA::String_out s3, - CORBA::Environment &) + CORBA::String_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -146,8 +146,8 @@ Param_Test_i::test_bounded_string (const char *s1, CORBA::WChar * Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3, - CORBA::Environment &) + CORBA::WString_out ws3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -169,8 +169,8 @@ Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar * Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3, - CORBA::Environment &) + CORBA::WString_out ws3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -190,8 +190,8 @@ Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, Param_Test::Fixed_Struct Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, - Param_Test::Fixed_Struct_out s3, - CORBA::Environment &) + Param_Test::Fixed_Struct_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1; @@ -204,8 +204,8 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Long_Seq * Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1, Param_Test::Long_Seq & s2, - Param_Test::Long_Seq_out s3, - CORBA::Environment &) + Param_Test::Long_Seq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Long_Seq @@ -222,8 +222,8 @@ Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1, Param_Test::Short_Seq * Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1, Param_Test::Short_Seq & s2, - Param_Test::Short_Seq_out s3, - CORBA::Environment &) + Param_Test::Short_Seq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Short_Seq @@ -240,8 +240,8 @@ Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1, Param_Test::Bounded_Short_Seq * Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, - Param_Test::Bounded_Short_Seq_out s3, - CORBA::Environment &) + Param_Test::Bounded_Short_Seq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Short_Seq @@ -258,8 +258,8 @@ Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & Param_Test::Bounded_Long_Seq * Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, - Param_Test::Bounded_Long_Seq_out s3, - CORBA::Environment &) + Param_Test::Bounded_Long_Seq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Long_Seq @@ -276,8 +276,8 @@ Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s Param_Test::StrSeq * Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, Param_Test::StrSeq &s2, - Param_Test::StrSeq_out s3, - CORBA::Environment &) + Param_Test::StrSeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -312,8 +312,8 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, Param_Test::Bounded_StrSeq * Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, - Param_Test::Bounded_StrSeq_out s3, - CORBA::Environment &) + Param_Test::Bounded_StrSeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -333,8 +333,8 @@ Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, Param_Test::WStrSeq * Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1, Param_Test::WStrSeq &ws2, - Param_Test::WStrSeq_out ws3, - CORBA::Environment &) + Param_Test::WStrSeq_out ws3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -354,8 +354,8 @@ Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1, Param_Test::Bounded_WStrSeq * Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1, Param_Test::Bounded_WStrSeq & ws2, - Param_Test::Bounded_WStrSeq_out ws3, - CORBA::Environment &) + Param_Test::Bounded_WStrSeq_out ws3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -376,8 +376,8 @@ Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1, Param_Test::StructSeq * Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::StructSeq &s2, - Param_Test::StructSeq_out s3, - CORBA::Environment &) + Param_Test::StructSeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -399,8 +399,8 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, - Param_Test::Bounded_StructSeq_out s3, - CORBA::Environment &) + Param_Test::Bounded_StructSeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_StructSeq @@ -418,8 +418,8 @@ Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, - Param_Test::PathSpec_out s3, - CORBA::Environment &) + Param_Test::PathSpec_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::PathSpec @@ -451,8 +451,8 @@ Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::ArraySeq * Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::ArraySeq &s2, - Param_Test::ArraySeq_out s3, - CORBA::Environment &) + Param_Test::ArraySeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -474,8 +474,8 @@ Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::Bounded_ArraySeq * Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1, Param_Test::Bounded_ArraySeq & s2, - Param_Test::Bounded_ArraySeq_out s3, - CORBA::Environment &) + Param_Test::Bounded_ArraySeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_ArraySeq @@ -492,8 +492,8 @@ Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, - Param_Test::Coffee_Mix_out s3, - CORBA::Environment &) + Param_Test::Coffee_Mix_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Coffee_Mix @@ -535,8 +535,8 @@ Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix * Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, - Param_Test::Bounded_Coffee_Mix_out s3, - CORBA::Environment &) + Param_Test::Bounded_Coffee_Mix_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Coffee_Mix @@ -578,8 +578,8 @@ Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::AnySeq * Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1, Param_Test::AnySeq &s2, - Param_Test::AnySeq_out s3, - CORBA::Environment &) + Param_Test::AnySeq_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -602,8 +602,8 @@ Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1, Param_Test::Var_Struct * Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, - Param_Test::Var_Struct_out s3, - CORBA::Environment &) + Param_Test::Var_Struct_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -624,8 +624,8 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Nested_Struct * Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, - Param_Test::Nested_Struct_out s3, - CORBA::Environment &) + Param_Test::Nested_Struct_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -646,8 +646,8 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Recursive_Struct * Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1, Param_Test::Recursive_Struct &s2, - Param_Test::Recursive_Struct_out s3, - CORBA::Environment &) + Param_Test::Recursive_Struct_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" structs into all the inout, out and return sequences. @@ -667,8 +667,8 @@ Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1, Param_Test::Objref_Struct * Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, - Param_Test::Objref_Struct_out s3, - CORBA::Environment &) + Param_Test::Objref_Struct_out s3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -687,32 +687,32 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr -Param_Test_i::make_coffee (CORBA::Environment &ACE_TRY_ENV) +Param_Test_i::make_coffee (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obj_._this (ACE_TRY_ENV); + return this->obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER); } // test for object references Coffee_ptr Param_Test_i::test_objref (Coffee_ptr o1, Coffee_ptr &o2, - Coffee_out o3, - CORBA::Environment &ACE_TRY_ENV) + Coffee_out o3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee_ptr ret = Coffee::_nil (); ACE_TRY { - Coffee_var myobj = obj_._this (ACE_TRY_ENV); + Coffee_var myobj = obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (o2)) CORBA::release (o2); - CORBA::Boolean equiv = myobj->_is_equivalent (o1, - ACE_TRY_ENV); + CORBA::Boolean equiv = myobj->_is_equivalent (o1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (equiv) @@ -746,8 +746,8 @@ Param_Test_i::test_objref (Coffee_ptr o1, CORBA::TypeCode_ptr Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &t2, - CORBA::TypeCode_out t3, - CORBA::Environment &/*env*/) + CORBA::TypeCode_out t3 + TAO_ENV_ARG_DECL_NOT_USED/*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { // we simply assign t1 to the others @@ -761,8 +761,8 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::Any * Param_Test_i::test_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Any_out a3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any *ret; @@ -784,7 +784,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, if (TAO_debug_level > 0) { CORBA::TypeCode_var tc = a1.type (); - int kind = tc->kind (ACE_TRY_ENV); + int kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -928,8 +928,8 @@ Param_Test_i::test_any (const CORBA::Any &a1, Param_Test::Fixed_Array_slice * Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, - Param_Test::Fixed_Array_out a3, - CORBA::Environment &) + Param_Test::Fixed_Array_out a3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Fixed_Array_slice *ret; @@ -944,8 +944,8 @@ Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Var_Array_slice * Param_Test_i::test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, - Param_Test::Var_Array_out a3, - CORBA::Environment &) + Param_Test::Var_Array_out a3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Var_Array_slice *ret; @@ -959,8 +959,8 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1, CORBA::ULong Param_Test_i::test_exception (CORBA::ULong s1, CORBA::ULong& s2, - CORBA::ULong_out s3, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)) { @@ -981,7 +981,7 @@ Param_Test_i::test_exception (CORBA::ULong s1, // warning that test_exception is throwing an exception // not in its THROW_SPEC, but still test TAO's // conversion of such an exception to UNKNOWN. - this->throw_badboy (ACE_TRY_ENV); + this->throw_badboy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 0; @@ -990,8 +990,8 @@ Param_Test_i::test_exception (CORBA::ULong s1, Param_Test::Big_Union* Param_Test_i::test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, - Param_Test::Big_Union_out u3, - CORBA::Environment &) + Param_Test::Big_Union_out u3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1)); @@ -1003,8 +1003,8 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1, Param_Test::Small_Union Param_Test_i::test_small_union (const Param_Test::Small_Union& u1, Param_Test::Small_Union& u2, - Param_Test::Small_Union_out u3, - CORBA::Environment &) + Param_Test::Small_Union_out u3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u2 = u1; @@ -1015,8 +1015,8 @@ Param_Test_i::test_small_union (const Param_Test::Small_Union& u1, Param_Test::Recursive_Union* Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1, Param_Test::Recursive_Union& ru2, - Param_Test::Recursive_Union_out ru3, - CORBA::Environment &) + Param_Test::Recursive_Union_out ru3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1)); @@ -1028,8 +1028,8 @@ Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1, CORBA::Any* Param_Test_i::test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3, - CORBA::Environment &) + CORBA::Any_out a3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret (new CORBA::Any (a1)); @@ -1041,8 +1041,8 @@ Param_Test_i::test_complex_any (const CORBA::Any &a1, Param_Test::Multdim_Array_slice * Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, Param_Test::Multdim_Array a2, - Param_Test::Multdim_Array_out a3, - CORBA::Environment &) + Param_Test::Multdim_Array_out a3 + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Multdim_Array_slice *ret; @@ -1054,14 +1054,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, } void -Param_Test_i::shutdown (CORBA::Environment &) +Param_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } void -Param_Test_i::throw_badboy (CORBA::Environment &ACE_TRY_ENV) +Param_Test_i::throw_badboy (TAO_ENV_SINGLE_ARG_DECL) { ACE_THROW (Param_Test::BadBoy ()); } diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index e523a86d71b..4e4cd6f371d 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -31,12 +31,12 @@ public: // =methods for the attribute - virtual Coffee::Desc * description (CORBA::Environment &env) + virtual Coffee::Desc * description (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // get attribute - virtual void description (const Coffee::Desc &description, - CORBA::Environment &env) + virtual void description (const Coffee::Desc &description + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // set attribute @@ -62,51 +62,51 @@ public: virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, - CORBA::Short_out s3, - CORBA::Environment &env) + CORBA::Short_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for shorts virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, - CORBA::ULongLong_out s3, - CORBA::Environment &env) + CORBA::ULongLong_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unsigned long long virtual char *test_unbounded_string (const char *s1, char *&s2, - CORBA::String_out s3, - CORBA::Environment &env) + CORBA::String_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded strings virtual char *test_bounded_string (const char *s1, char *&s2, - CORBA::String_out s3, - CORBA::Environment &env) + CORBA::String_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded strings virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3, - CORBA::Environment &env) + CORBA::WString_out ws3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded wstrings virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3, - CORBA::Environment &env) + CORBA::WString_out ws3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded wstrings virtual Param_Test::Fixed_Struct test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, - Param_Test::Fixed_Struct_out s3, - CORBA::Environment &env) + Param_Test::Fixed_Struct_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed structures @@ -114,221 +114,221 @@ public: virtual Param_Test::Long_Seq * test_long_sequence ( const Param_Test::Long_Seq & s1, Param_Test::Long_Seq & s2, - Param_Test::Long_Seq_out s3, - CORBA::Environment &env) + Param_Test::Long_Seq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence ( const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, - Param_Test::Bounded_Long_Seq_out s3, - CORBA::Environment &env) + Param_Test::Bounded_Long_Seq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Short_Seq * test_short_sequence ( const Param_Test::Short_Seq & s1, Param_Test::Short_Seq & s2, - Param_Test::Short_Seq_out s3, - CORBA::Environment &env) + Param_Test::Short_Seq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence ( const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, - Param_Test::Bounded_Short_Seq_out s3, - CORBA::Environment &env) + Param_Test::Bounded_Short_Seq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::StrSeq * test_strseq ( const Param_Test::StrSeq & s1, Param_Test::StrSeq & s2, - Param_Test::StrSeq_out s3, - CORBA::Environment &env) + Param_Test::StrSeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StrSeq * test_bounded_strseq ( const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, - Param_Test::Bounded_StrSeq_out s3, - CORBA::Environment &env) + Param_Test::Bounded_StrSeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::WStrSeq * test_wstrseq ( const Param_Test::WStrSeq & ws1, Param_Test::WStrSeq & ws2, - Param_Test::WStrSeq_out ws3, - CORBA::Environment &env) + Param_Test::WStrSeq_out ws3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq ( const Param_Test::Bounded_WStrSeq & ws1, Param_Test::Bounded_WStrSeq & ws2, - Param_Test::Bounded_WStrSeq_out ws3, - CORBA::Environment &env) + Param_Test::Bounded_WStrSeq_out ws3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::StructSeq * test_struct_sequence ( const Param_Test::StructSeq & s1, Param_Test::StructSeq & s2, - Param_Test::StructSeq_out s3, - CORBA::Environment &env) + Param_Test::StructSeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::PathSpec * test_unbounded_struct_sequence ( const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, - Param_Test::PathSpec_out s3, - CORBA::Environment &env) + Param_Test::PathSpec_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence ( const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, - Param_Test::Bounded_StructSeq_out s3, - CORBA::Environment &env) + Param_Test::Bounded_StructSeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::ArraySeq * test_array_sequence ( const Param_Test::ArraySeq & s1, Param_Test::ArraySeq & s2, - Param_Test::ArraySeq_out s3, - CORBA::Environment &env) + Param_Test::ArraySeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence ( const Param_Test::Bounded_ArraySeq & s1, Param_Test::Bounded_ArraySeq & s2, - Param_Test::Bounded_ArraySeq_out s3, - CORBA::Environment &env) + Param_Test::Bounded_ArraySeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Coffee_Mix * test_coffe_mix ( const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, - Param_Test::Coffee_Mix_out s3, - CORBA::Environment &env) + Param_Test::Coffee_Mix_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix ( const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, - Param_Test::Bounded_Coffee_Mix_out s3, - CORBA::Environment &env) + Param_Test::Bounded_Coffee_Mix_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::AnySeq * test_anyseq ( const Param_Test::AnySeq & s1, Param_Test::AnySeq & s2, - Param_Test::AnySeq_out s3, - CORBA::Environment &env) + Param_Test::AnySeq_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // = End of sequences tests.... virtual Param_Test::Var_Struct * test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, - Param_Test::Var_Struct_out s3, - CORBA::Environment &env) + Param_Test::Var_Struct_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for variable structs virtual Param_Test::Nested_Struct * test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, - Param_Test::Nested_Struct_out s3, - CORBA::Environment &env) + Param_Test::Nested_Struct_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for nested structs virtual Param_Test::Recursive_Struct * test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, - Param_Test::Recursive_Struct_out rs3, - CORBA::Environment &env) + Param_Test::Recursive_Struct_out rs3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for recursive structs virtual Param_Test::Objref_Struct * test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, - Param_Test::Objref_Struct_out s3, - CORBA::Environment &env) + Param_Test::Objref_Struct_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Coffee_ptr - make_coffee (CORBA::Environment &env) + make_coffee (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // make a coffee object virtual Coffee_ptr test_objref (Coffee_ptr o1, Coffee_ptr &o2, - Coffee_out o3, - CORBA::Environment &env) + Coffee_out o3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for object references virtual CORBA::TypeCode_ptr test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, - CORBA::TypeCode_out o3, - CORBA::Environment &env) + CORBA::TypeCode_out o3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for typecodes virtual CORBA::Any * test_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3, - CORBA::Environment &env) + CORBA::Any_out a3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for Anys virtual Param_Test::Fixed_Array_slice * test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, - Param_Test::Fixed_Array_out a3, - CORBA::Environment &env) + Param_Test::Fixed_Array_out a3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed size arrays virtual Param_Test::Var_Array_slice * test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, - Param_Test::Var_Array_out a3, - CORBA::Environment &env) + Param_Test::Var_Array_out a3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for arrays of variable types virtual CORBA::ULong test_exception (CORBA::ULong s1, CORBA::ULong& s2, - CORBA::ULong_out s3, - CORBA::Environment &env) + CORBA::ULong_out s3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)); virtual Param_Test::Big_Union* test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, - Param_Test::Big_Union_out u3, - CORBA::Environment &env) + Param_Test::Big_Union_out u3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Small_Union test_small_union (const Param_Test::Small_Union& u1, Param_Test::Small_Union& u2, - Param_Test::Small_Union_out u3, - CORBA::Environment &env) + Param_Test::Small_Union_out u3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Recursive_Union* test_recursive_union (const Param_Test::Recursive_Union& ru1, Param_Test::Recursive_Union& ru2, - Param_Test::Recursive_Union_out ru3, - CORBA::Environment &env) + Param_Test::Recursive_Union_out ru3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any* test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3, - CORBA::Environment &env) + CORBA::Any_out a3 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test for multi dimensional arrays virtual Param_Test::Multdim_Array_slice * test_multdim_array (const Param_Test::Multdim_Array, Param_Test::Multdim_Array , - Param_Test::Multdim_Array_out , - CORBA::Environment &) + Param_Test::Multdim_Array_out + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment &env) + void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -339,7 +339,7 @@ private: Coffee_i obj_; // the coffee object reference we maintain - void throw_badboy (CORBA::Environment &ACE_TRY_ENV); + void throw_badboy (TAO_ENV_SINGLE_ARG_DECL); // Called by test_exception. This will avoid the compiler // warning that test_exception is throwing an exception // not in its THROW_SPEC, but still test TAO's diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index 3f868f8aefb..cbe8190640b 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -47,8 +47,8 @@ Test_Recursive_Struct::opname (void) const } void -Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Recursive_Struct); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Struct *tmp; @@ -64,21 +64,21 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Struct (*tmp); } int -Test_Recursive_Struct::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Recursive_Struct::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -116,8 +116,8 @@ Test_Recursive_Struct::reset_parameters (void) } int -Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -125,8 +125,8 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_recursive_struct (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h index cb84b23be28..8e5af6b8d62 100644 --- a/TAO/tests/Param_Test/recursive_struct.h +++ b/TAO/tests/Param_Test/recursive_struct.h @@ -35,15 +35,15 @@ public: ~Test_Recursive_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,8 +58,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index fa8ede8eed0..1c9ec710040 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -47,8 +47,8 @@ Test_Recursive_Union::opname (void) const } void -Test_Recursive_Union::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Recursive_Union::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Recursive_Union); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Union *tmp; @@ -64,21 +64,21 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Union (*tmp); } int -Test_Recursive_Union::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Recursive_Union::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -118,8 +118,8 @@ Test_Recursive_Union::reset_parameters (void) } int -Test_Recursive_Union::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Recursive_Union::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -127,8 +127,8 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_recursive_union (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h index 3dad5de6eaf..d7faea6fef3 100644 --- a/TAO/tests/Param_Test/recursive_union.h +++ b/TAO/tests/Param_Test/recursive_union.h @@ -35,15 +35,15 @@ public: ~Test_Recursive_Union (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,8 +58,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp index 8187d3ad3c1..23ce8f75a3e 100644 --- a/TAO/tests/Param_Test/results.cpp +++ b/TAO/tests/Param_Test/results.cpp @@ -102,8 +102,8 @@ Results::print_stats (void) } void -Results::print_exception (const char * /* call_name */, - CORBA::Environment &) +Results::print_exception (const char * /* call_name */ + TAO_ENV_ARG_DECL_NOT_USED) { //ACE_PRINT_EXCEPTION (call_name); } diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h index 5f8139f655b..81225cd2d01 100644 --- a/TAO/tests/Param_Test/results.h +++ b/TAO/tests/Param_Test/results.h @@ -38,8 +38,8 @@ public: void print_stats (void); // prints the time stats - void print_exception (const char *call_name, - CORBA::Environment &); + void print_exception (const char *call_name + TAO_ENV_ARG_DECL_NOT_USED); // print the exception void start_timer (void); diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 738a343337e..c1ed50851ec 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -61,12 +61,12 @@ main (int argc, char *argv[]) PortableServer::POA_var oa_ptr; Param_Test_i *param_test = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { const char *orb_name = ""; CORBA::ORB_var orb_ptr = - CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var temp; // holder for the myriad of times we get @@ -74,8 +74,8 @@ main (int argc, char *argv[]) // Get the Root POA - temp = orb_ptr->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + temp = orb_ptr->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (temp.in())) @@ -83,29 +83,29 @@ main (int argc, char *argv[]) "(%P|%t) Unable to get root poa reference.\n"), 1); - oa_ptr = PortableServer::POA::_narrow (temp.in(), ACE_TRY_ENV); + oa_ptr = PortableServer::POA::_narrow (temp.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - oa_ptr->the_POAManager (ACE_TRY_ENV); + oa_ptr->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); policies.length (2); policies[0] = - oa_ptr->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + oa_ptr->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); policies[1] = - oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT, - ACE_TRY_ENV); + oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT + TAO_ENV_ARG_PARAMETER); // We use a different POA, otherwise the user would have to // change the object key each time it invokes the server. PortableServer::POA_var good_poa = oa_ptr->create_POA ("child_poa", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse remaining command line and verify parameters. @@ -123,20 +123,20 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("param_test"); good_poa->activate_object_with_id (id.in (), - param_test, - ACE_TRY_ENV); + param_test + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to // stdout. Someone will take that string and give it to a // client. Then release the object. - temp = good_poa->id_to_reference (id.in (), ACE_TRY_ENV); + temp = good_poa->id_to_reference (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb_ptr->object_to_string (temp.in (), - ACE_TRY_ENV); + orb_ptr->object_to_string (temp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -149,20 +149,20 @@ main (int argc, char *argv[]) // Make the POAs controlled by this manager active - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb_ptr->run (ACE_TRY_ENV); + orb_ptr->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; good_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; oa_ptr->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index f8d8bd3a5f0..6c906cbbadd 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -43,8 +43,8 @@ Test_Short::opname (void) const } void -Test_Short::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Short::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -52,25 +52,25 @@ Test_Short::dii_req_invoke (CORBA::Request *req, req->set_return_type (CORBA::_tc_short); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } int -Test_Short::init_parameters (Param_Test_ptr /*objref*/, - CORBA::Environment &) +Test_Short::init_parameters (Param_Test_ptr /*objref*/ + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -89,15 +89,15 @@ Test_Short::reset_parameters (void) } int -Test_Short::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Short::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_short (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index 285bd3ec428..035f428d59d 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -33,15 +33,15 @@ public: ~Test_Short (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp index d2036b5cb41..555e42c38c8 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -45,8 +45,8 @@ Test_Small_Union::opname (void) const } void -Test_Small_Union::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Small_Union::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -54,7 +54,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Small_Union); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Small_Union *tmp; @@ -62,26 +62,26 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Small_Union (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Small_Union (*tmp); } int -Test_Small_Union::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Small_Union::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (ACE_TRY_ENV); + this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -129,15 +129,15 @@ Test_Small_Union::reset_parameters (void) } int -Test_Small_Union::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Small_Union::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_small_union (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h index f4b3bc22981..6e6a39025ab 100644 --- a/TAO/tests/Param_Test/small_union.h +++ b/TAO/tests/Param_Test/small_union.h @@ -33,15 +33,15 @@ public: ~Test_Small_Union (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index ca4807dab86..23972a2ef3f 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -43,8 +43,8 @@ Test_TypeCode::opname (void) const } void -Test_TypeCode::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_TypeCode::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -52,7 +52,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req, req->set_return_type (CORBA::_tc_TypeCode); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_ptr tmp; @@ -60,21 +60,21 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req, this->ret_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::TypeCode::_duplicate (tmp); } int -Test_TypeCode::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_TypeCode::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { static CORBA::TypeCode_ptr tc_table [] = { @@ -115,20 +115,20 @@ Test_TypeCode::reset_parameters (void) } int -Test_TypeCode::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_TypeCode::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { - this->init_parameters (objref, ACE_TRY_ENV); + this->init_parameters (objref TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_out out (this->out_); this->ret_ = objref->test_typecode (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -146,22 +146,22 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref, CORBA::Boolean Test_TypeCode::check_validity (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Boolean one, two, three; - one = this->in_.in ()->equal (this->inout_.in (), - ACE_TRY_ENV); + one = this->in_.in ()->equal (this->inout_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - two = this->in_.in ()->equal (this->out_.in (), - ACE_TRY_ENV); + two = this->in_.in ()->equal (this->out_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - three = this->in_.in ()->equal (this->ret_.in (), - ACE_TRY_ENV); + three = this->in_.in ()->equal (this->ret_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (one && two && three) diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index cde6cfb1c2a..75d2ac358a3 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -33,15 +33,15 @@ public: ~Test_TypeCode (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index 035ed312b29..a05bc294abc 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -51,8 +51,8 @@ Test_AnySeq::opname (void) const } void -Test_AnySeq::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_AnySeq::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -60,7 +60,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_AnySeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::AnySeq* tmp; @@ -68,21 +68,21 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::AnySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::AnySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::AnySeq (*tmp); } int -Test_AnySeq::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_AnySeq::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,7 +124,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref, ACE_TRY { // get access to a Coffee Object - Coffee_var cobj = objref->make_coffee (ACE_TRY_ENV); + Coffee_var cobj = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // insert the coffee object into the Any @@ -197,8 +197,8 @@ Test_AnySeq::reset_parameters (void) int -Test_AnySeq::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_AnySeq::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -206,8 +206,8 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_anyseq (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index 832921be5d0..5d610cc85c5 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -33,15 +33,15 @@ public: ~Test_AnySeq (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp index c21ca596b33..a4534a5129a 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -46,8 +46,8 @@ Test_Array_Sequence::opname (void) const } void -Test_Array_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Array_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -55,7 +55,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_ArraySeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::ArraySeq *tmp; @@ -63,21 +63,21 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::ArraySeq (*tmp); } int -Test_Array_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Array_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,8 +125,8 @@ Test_Array_Sequence::reset_parameters (void) } int -Test_Array_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Array_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -134,8 +134,8 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_array_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h index 0f7a0060dbf..aec3e9cc1a8 100644 --- a/TAO/tests/Param_Test/ub_array_seq.h +++ b/TAO/tests/Param_Test/ub_array_seq.h @@ -34,15 +34,15 @@ public: ~Test_Array_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,8 +57,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index 87b7211e33c..eeae63f57e9 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -47,8 +47,8 @@ Test_Long_Sequence::opname (void) const } void -Test_Long_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Long_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Long_Seq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Long_Seq *tmp; @@ -64,21 +64,21 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = Param_Test::Long_Seq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Param_Test::Long_Seq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = Param_Test::Long_Seq (*tmp); } int -Test_Long_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Long_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -107,8 +107,8 @@ Test_Long_Sequence::reset_parameters (void) } int -Test_Long_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Long_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -116,8 +116,8 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_long_sequence (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index 0a57a526d38..bf1dff7b476 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -34,15 +34,15 @@ public: ~Test_Long_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index 7c540d19e52..99a8e7f0761 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -57,8 +57,8 @@ Test_ObjRef_Sequence::opname (void) const } void -Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,7 +66,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Coffee_Mix); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Coffee_Mix *tmp; @@ -74,21 +74,21 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Coffee_Mix (*tmp); } int -Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -106,7 +106,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref, { // generate some arbitrary string to be filled into the ith location in // the sequence - this->in_[i] = objref->make_coffee (ACE_TRY_ENV); + this->in_[i] = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // select a Coffee flavor at random @@ -116,8 +116,8 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref, // set the attribute for the in object Coffee_ptr tmp = this->in_[i]; - tmp->description (desc, - ACE_TRY_ENV); + tmp->description (desc + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -143,8 +143,8 @@ Test_ObjRef_Sequence::reset_parameters (void) } int -Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -152,8 +152,8 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_coffe_mix (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -171,23 +171,23 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref, CORBA::Boolean Test_ObjRef_Sequence::check_validity (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->compare (this->in_, - this->inout_.in (), - ACE_TRY_ENV); + this->inout_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->compare (this->in_, - this->out_.in (), - ACE_TRY_ENV); + this->out_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->compare (this->in_, - this->ret_.in (), - ACE_TRY_ENV); + this->ret_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 1; @@ -232,8 +232,8 @@ Test_ObjRef_Sequence::print_values (void) CORBA::Boolean Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, - const Param_Test::Coffee_Mix &s2, - CORBA::Environment &ACE_TRY_ENV) + const Param_Test::Coffee_Mix &s2 + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -261,12 +261,12 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, return 0; } - Coffee::Desc_var desc1 = vs1->description (ACE_TRY_ENV); + Coffee::Desc_var desc1 = vs1->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var n1 = desc1->name.in (); - Coffee::Desc_var desc2 = vs2->description (ACE_TRY_ENV); + Coffee::Desc_var desc2 = vs2->description (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var n2 = desc2->name.in (); diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index b1736c89fd7..fe9ad8e0ff3 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -34,15 +34,15 @@ public: ~Test_ObjRef_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,13 +57,13 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1, - const Param_Test::Coffee_Mix &s2, - CORBA::Environment& env); + const Param_Test::Coffee_Mix &s2 + TAO_ENV_ARG_DECL); // compare void print_sequence (const Param_Test::Coffee_Mix &s); diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index bc7d7632a8c..b6d97bb5af4 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -47,8 +47,8 @@ Test_Short_Sequence::opname (void) const } void -Test_Short_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Short_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Short_Seq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Short_Seq *tmp; @@ -64,21 +64,21 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Short_Seq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Short_Seq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Short_Seq (*tmp); } int -Test_Short_Sequence::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Short_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -109,8 +109,8 @@ Test_Short_Sequence::reset_parameters (void) } int -Test_Short_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Short_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -118,8 +118,8 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_short_sequence (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index 9aa38e21a8e..556f82606ec 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -34,15 +34,15 @@ public: ~Test_Short_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 301a40ce27c..a7bb6108914 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -47,8 +47,8 @@ Test_String_Sequence::opname (void) const } void -Test_String_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_String_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_StrSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StrSeq *tmp; @@ -64,21 +64,21 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::StrSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StrSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StrSeq (*tmp); } int -Test_String_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_String_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { const char *choiceList[] = { @@ -113,8 +113,8 @@ Test_String_Sequence::reset_parameters (void) } int -Test_String_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_String_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -122,8 +122,8 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_strseq (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 24f438c84b7..25cc75e3dc8 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -34,15 +34,15 @@ public: ~Test_String_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index 06c8ef2fde4..ff695b3e18e 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -55,8 +55,8 @@ Test_Unbounded_String::opname (void) const } void -Test_Unbounded_String::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_String::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -67,7 +67,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req, req->set_return_type (CORBA::_tc_string); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *tmp; @@ -75,21 +75,21 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req, this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::string_dup (tmp); } int -Test_Unbounded_String::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Unbounded_String::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,8 +125,8 @@ Test_Unbounded_String::reset_parameters (void) } int -Test_Unbounded_String::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_String::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -134,8 +134,8 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_unbounded_string (this->in_, this->inout_, - str_out, - ACE_TRY_ENV); + str_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index f20176a3e98..00491ae399c 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -33,15 +33,15 @@ public: ~Test_Unbounded_String (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 0b6cbc779e7..be2efce2d3d 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -48,8 +48,8 @@ Test_Struct_Sequence::opname (void) const } void -Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -57,7 +57,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_StructSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StructSeq *tmp; @@ -65,21 +65,21 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StructSeq (*tmp); } int -Test_Struct_Sequence::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Struct_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -110,8 +110,8 @@ Test_Struct_Sequence::reset_parameters (void) } int -Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -119,8 +119,8 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_struct_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -255,8 +255,8 @@ Test_Unbounded_Struct_Sequence::opname (void) const } void -Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -264,7 +264,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_PathSpec); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::PathSpec *tmp; @@ -272,21 +272,21 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::PathSpec (*tmp); } int -Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -318,14 +318,14 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) } int -Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { Param_Test::PathSpec_out out (this->out_.out ()); this->ret_ = objref->test_unbounded_struct_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 465b6b5574d..9fae482e77b 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -34,15 +34,15 @@ public: ~Test_Struct_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: @@ -97,15 +97,15 @@ public: ~Test_Unbounded_Struct_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -120,7 +120,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index c609165f1d1..15852c15044 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -47,8 +47,8 @@ Test_WString_Sequence::opname (void) const } void -Test_WString_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_WString_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_WStrSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::WStrSeq *tmp; @@ -64,21 +64,21 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::WStrSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::WStrSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::WStrSeq (*tmp); } int -Test_WString_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_WString_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -108,8 +108,8 @@ Test_WString_Sequence::reset_parameters (void) } int -Test_WString_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_WString_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -117,8 +117,8 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_wstrseq (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h index fee0572fb65..31e426c263f 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -34,15 +34,15 @@ public: ~Test_WString_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,8 +57,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index 93318ed53fd..255e49b96b0 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -55,8 +55,8 @@ Test_Unbounded_WString::opname (void) const } void -Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -67,7 +67,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req, req->set_return_type (CORBA::_tc_wstring); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::WChar *tmp; @@ -75,21 +75,21 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req, this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::wstring_dup (tmp); } int -Test_Unbounded_WString::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Unbounded_WString::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,8 +124,8 @@ Test_Unbounded_WString::reset_parameters (void) } int -Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -133,8 +133,8 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_unbounded_wstring (this->in_, this->inout_, - str_out, - ACE_TRY_ENV); + str_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h index e2509254885..54b98554916 100644 --- a/TAO/tests/Param_Test/ub_wstring.h +++ b/TAO/tests/Param_Test/ub_wstring.h @@ -33,15 +33,15 @@ public: ~Test_Unbounded_WString (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,8 +56,8 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, - CORBA::Environment &); + void dii_req_invoke (CORBA::Request * + TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp index 5f92783911d..05360195cb3 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -39,8 +39,8 @@ Test_ULongLong::opname (void) const } void -Test_ULongLong::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_ULongLong::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -48,25 +48,25 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req, req->set_return_type (CORBA::_tc_ulonglong); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } int -Test_ULongLong::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_ULongLong::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -85,15 +85,15 @@ Test_ULongLong::reset_parameters (void) } int -Test_ULongLong::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_ULongLong::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_ulonglong (this->in_, this->inout_, - this->out_, - ACE_TRY_ENV); + this->out_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index 452f9721aa6..630fd839570 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -30,15 +30,15 @@ public: ~Test_ULongLong (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -53,7 +53,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index ea7a29e70f9..7a429a50a7e 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -45,8 +45,8 @@ Test_Var_Array::opname (void) const } void -Test_Var_Array::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Var_Array::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= Param_Test::Var_Array_forany (this->in_); req->add_inout_arg ("s2") <<= Param_Test::Var_Array_forany (this->inout_); @@ -54,7 +54,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Var_Array); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Var_Array_forany forany; @@ -63,21 +63,21 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req, this->ret_ = Param_Test::Var_Array_dup (forany.in ()); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= forany; Param_Test::Var_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= forany; this->out_ = Param_Test::Var_Array_dup (forany.in ()); } int -Test_Var_Array::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Var_Array::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -103,16 +103,16 @@ Test_Var_Array::reset_parameters (void) } int -Test_Var_Array::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Var_Array::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { Param_Test::Var_Array_out out_arr (this->out_.out ()); this->ret_ = objref->test_var_array (this->in_, this->inout_, - out_arr, - ACE_TRY_ENV); + out_arr + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index f281f8dc558..f964a09a1a3 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -33,15 +33,15 @@ public: ~Test_Var_Array (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *,CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index ce87174a3b2..849d80bcb16 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -48,8 +48,8 @@ Test_Var_Struct::opname (void) const } void -Test_Var_Struct::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Var_Struct::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -57,7 +57,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Var_Struct); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Var_Struct *tmp; @@ -65,21 +65,21 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1, ACE_TRY_ENV); + req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2, ACE_TRY_ENV); + req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Var_Struct (*tmp); } int -Test_Var_Struct::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Var_Struct::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -133,16 +133,16 @@ Test_Var_Struct::reset_parameters (void) } int -Test_Var_Struct::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Var_Struct::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { Param_Test::Var_Struct_out out (this->out_.out ()); this->ret_ = objref->test_var_struct (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index de08ee37c24..b9fea7c0028 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -34,15 +34,15 @@ public: ~Test_Var_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref, - CORBA::Environment &env); + int run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref, - CORBA::Environment &env); + int init_parameters (Param_Test_ptr objref + TAO_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request *, CORBA::Environment &); + void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: |