diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
| commit | 56681ffa90714cf82c32e907c0f80cea75166740 (patch) | |
| tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/tests/Param_Test | |
| parent | 6b5e98c78a7f66029147fad41e2e75cea35854aa (diff) | |
| download | ATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz | |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/tests/Param_Test')
80 files changed, 545 insertions, 545 deletions
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index e12c722c98f..af6bddcb277 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 TAO_ENV_ARG_DECL) +Test_Any::dii_req_invoke (CORBA::Request *req ACE_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 TAO_ENV_ARG_DECL) req->set_return_type (CORBA::_tc_any); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -64,13 +64,13 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); @@ -93,12 +93,12 @@ static const CORBA::TypeCode_ptr any_table [] = int Test_Any::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -270,14 +270,14 @@ Test_Any::reset_parameters (void) int Test_Any::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_any (this->in_, this->inout_, this->out_.out () - TAO_ENV_ARG_PARAMETER); + ACE_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 501d31336f8..f27f8be3c99 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -48,14 +48,14 @@ public: }; int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 fe874758829..f8068a4ca54 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -33,7 +33,7 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Get_Opt get_opt (argc, argv, "dn:l:"); @@ -91,12 +91,12 @@ main (int argc, char *argv[]) { CORBA::Object_var obj = orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Param_Test_var param_test = Param_Test::_unchecked_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + param_test->_is_equivalent (o ACE_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 1b7edb51d8e..7bf7c6936b5 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -49,14 +49,14 @@ Test_Bounded_Array_Sequence::opname (void) const void Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_ArraySeq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_ArraySeq (*tmp); @@ -78,7 +78,7 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,7 +124,7 @@ Test_Bounded_Array_Sequence::reset_parameters (void) int Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref objref->test_bounded_array_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 2069c790f58..060454b6e71 100644 --- a/TAO/tests/Param_Test/bd_array_seq.h +++ b/TAO/tests/Param_Test/bd_array_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 a32c2d50f10..38bb0ed35ee 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -48,14 +48,14 @@ Test_Bounded_Long_Sequence::opname (void) const void Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_Long_Seq *tmp; @@ -63,13 +63,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Long_Seq (*tmp); @@ -77,7 +77,7 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // get some sequence length (32 in this case) CORBA::ULong len = this->in_->maximum (); @@ -115,7 +115,7 @@ Test_Bounded_Long_Sequence::reset_parameters (void) int Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -123,7 +123,7 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_long_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 d7b49cd3b45..52e9fbdeb02 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 21836ba0f74..e6a6f205546 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -48,14 +48,14 @@ Test_Bounded_Short_Sequence::opname (void) const void Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_Short_Seq *tmp; @@ -63,13 +63,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Short_Seq (*tmp); @@ -77,7 +77,7 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED /*env*/) + ACE_ENV_ARG_DECL_NOT_USED /*env*/) { // ACE_UNUSED_ARG (objref); @@ -119,7 +119,7 @@ Test_Bounded_Short_Sequence::reset_parameters (void) int Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -128,7 +128,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_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 f0b9b33944b..78f402b4f63 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 3df97b029d1..1ca7bb06806 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -48,7 +48,7 @@ Test_Bounded_String_Sequence::opname (void) const void Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_StrSeq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StrSeq (*tmp); @@ -78,7 +78,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const char *choiceList[] = { @@ -112,7 +112,7 @@ Test_Bounded_String_Sequence::reset_parameters (void) int Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -121,7 +121,7 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_strseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 be4e9061e40..31936d01fec 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 88bce95539d..538784a75a0 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -56,7 +56,7 @@ Test_Bounded_String::opname (void) const void Test_Bounded_String::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; char *tmp; @@ -75,13 +75,13 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= CORBA::Any::to_string (tmp, 128); this->out_ = CORBA::string_dup (tmp); @@ -89,7 +89,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req int Test_Bounded_String::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,7 +125,7 @@ Test_Bounded_String::reset_parameters (void) int Test_Bounded_String::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_string (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_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 5d28250b598..f8024a686ff 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 3666187016c..f382a7badbe 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -51,14 +51,14 @@ Test_Bounded_Struct_Sequence::opname (void) const void Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_StructSeq *tmp; @@ -66,13 +66,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StructSeq (*tmp); @@ -80,7 +80,7 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */ - TAO_ENV_ARG_DECL_NOT_USED /* env */) + ACE_ENV_ARG_DECL_NOT_USED /* env */) { Generator *gen = GENERATOR::instance (); // value generator @@ -117,7 +117,7 @@ Test_Bounded_Struct_Sequence::reset_parameters (void) int Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -126,7 +126,7 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_struct_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 5302176d981..e59ef86b43e 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 a0b9ae9d756..3c5c065af16 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -48,7 +48,7 @@ Test_Bounded_WString_Sequence::opname (void) const void Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_WStrSeq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_WStrSeq (*tmp); @@ -78,7 +78,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -111,7 +111,7 @@ Test_Bounded_WString_Sequence::reset_parameters (void) int Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -120,7 +120,7 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_wstrseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 038cc5f7be9..b1057f513f6 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.h +++ b/TAO/tests/Param_Test/bd_wstr_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 3100895a2b7..3d94454d818 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -56,7 +56,7 @@ Test_Bounded_WString::opname (void) const void Test_Bounded_WString::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::WChar *tmp; @@ -75,13 +75,13 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128); this->out_ = CORBA::wstring_dup (tmp); @@ -89,7 +89,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req int Test_Bounded_WString::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,7 +125,7 @@ Test_Bounded_WString::reset_parameters (void) int Test_Bounded_WString::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_wstring (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_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 dbb2a29b882..ec0fb098b2e 100644 --- a/TAO/tests/Param_Test/bd_wstring.h +++ b/TAO/tests/Param_Test/bd_wstring.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 0cb0f5589af..d63460e7eeb 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -46,7 +46,7 @@ Test_Big_Union::opname (void) const void Test_Big_Union::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Big_Union *tmp; @@ -62,13 +62,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Big_Union (*tmp); @@ -76,12 +76,12 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req int Test_Big_Union::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -229,14 +229,14 @@ Test_Big_Union::reset_parameters (void) int Test_Big_Union::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_big_union (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -286,7 +286,7 @@ Test_Big_Union::check_validity (void) break; case 1: { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + in->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var inout_desc = - inout->description (TAO_ENV_SINGLE_ARG_PARAMETER); + inout->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var out_desc = - out->description (TAO_ENV_SINGLE_ARG_PARAMETER); + out->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var ret_desc = - ret->description (TAO_ENV_SINGLE_ARG_PARAMETER); + ret->description (ACE_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 e66dbf4f6a6..f08e0eac9c3 100644 --- a/TAO/tests/Param_Test/big_union.h +++ b/TAO/tests/Param_Test/big_union.h @@ -38,14 +38,14 @@ public: }; int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 3fe60d6cd70..c1edb32fbb2 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 - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Initialize parameters for the test. int check = this->test_object_->init_parameters (this->param_test_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check == -1) @@ -98,7 +98,7 @@ Param_Test_Client<T>::run_sii_test (void) // make the call this->test_object_->run_sii_test (this->param_test_ - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // initialize parameters for the test int check = this->test_object_->init_parameters (this->param_test_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check == -1) @@ -208,7 +208,7 @@ Param_Test_Client<T>::run_dii_test (void) ACE_TRY { req = this->param_test_->_request (opname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (opt->debug ()) @@ -219,7 +219,7 @@ Param_Test_Client<T>::run_dii_test (void) // Make the invocation, verify the result. this->test_object_->dii_req_invoke (req.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 d3d621880fe..730761cca34 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -52,7 +52,7 @@ Test_Complex_Any::opname (void) const void Test_Complex_Any::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -68,13 +68,13 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); @@ -82,7 +82,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req int Test_Complex_Any::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->reset_parameters (); } @@ -168,14 +168,14 @@ Test_Complex_Any::reset_parameters (void) int Test_Complex_Any::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_complex_any (this->in_, this->inout_, this->out_.out () - TAO_ENV_ARG_PARAMETER); + ACE_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 0637a5647e9..8ad9e40be77 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 cac0b11e525..ba14469be30 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -61,7 +61,7 @@ int Driver::init (int argc, char **argv) { // environment to track exceptions - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // retrieve the instance of Options Options *opt = OPTIONS::instance (); @@ -76,7 +76,7 @@ Driver::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (argc, argv, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -89,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 () TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -102,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() TAO_ENV_ARG_PARAMETER); + this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -613,12 +613,12 @@ Driver::run (void) } // Get in a new environment variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (opt->shutdown ()) { - this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 5d2b8a77165..7eb9b210746 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -48,7 +48,7 @@ Test_Exception::opname (void) const void Test_Exception::dii_req_invoke (CORBA::Request_ptr req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } @@ -132,7 +132,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req int Test_Exception::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -152,7 +152,7 @@ Test_Exception::reset_parameters (void) int Test_Exception::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -160,7 +160,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_exception (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_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 5efa62b14f8..acc0f1c2cb0 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -31,14 +31,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 b34cdbd5e46..02eb437af97 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -45,14 +45,14 @@ Test_Fixed_Array::opname (void) const void Test_Fixed_Array::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Array_forany out_any (this->out_); *arg3->value () >>= forany; @@ -75,7 +75,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req int Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -107,14 +107,14 @@ Test_Fixed_Array::reset_parameters (void) int Test_Fixed_Array::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_fixed_array (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_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 04c3744cb91..c064b8106fb 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 46e87cc5b66..669c7a9e7f8 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -44,14 +44,14 @@ Test_Fixed_Struct::opname (void) const void Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Struct *tmp; @@ -59,13 +59,13 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req this->ret_ = *tmp; CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = *tmp; @@ -73,7 +73,7 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req int Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -106,14 +106,14 @@ Test_Fixed_Struct::reset_parameters (void) int Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_fixed_struct (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_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 c8c7a7f0c8d..b791bbe5e3e 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 6dd783bf1e5..ee238011542 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -47,7 +47,7 @@ Test_Multdim_Array::opname (void) const void Test_Multdim_Array::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= forany; Param_Test::Multdim_Array_copy (this->out_, forany.in ()); @@ -78,7 +78,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req int Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -134,14 +134,14 @@ Test_Multdim_Array::reset_parameters (void) int Test_Multdim_Array::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_multdim_array (this->in_.in (), this->inout_.inout (), this->out_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h index e82d6dd0bd4..a6ab0243884 100644 --- a/TAO/tests/Param_Test/multdim_array.h +++ b/TAO/tests/Param_Test/multdim_array.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 022c4fb538f..4b16cd9ff6a 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 TAO_ENV_ARG_DECL) +Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Nested_Struct *tmp; @@ -63,13 +63,13 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) this->ret_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Nested_Struct (*tmp); @@ -77,7 +77,7 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) int Test_Nested_Struct::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -131,7 +131,7 @@ Test_Nested_Struct::reset_parameters (void) int Test_Nested_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -139,7 +139,7 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_nested_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 7fa958598b1..50a456bd479 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 128959dfed3..c629356d959 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -44,7 +44,7 @@ Test_ObjRef::opname (void) const void Test_ObjRef::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = Coffee::_duplicate (tmp); @@ -83,7 +83,7 @@ static const char *Coffee_Flavor [] = { int Test_ObjRef::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -95,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get some index into Coffee_Flavor []. @@ -104,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 TAO_ENV_ARG_PARAMETER); // set the attribute for the in object + this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object ACE_TRY_CHECK; this->inout_ = Coffee::_nil (); @@ -125,7 +125,7 @@ int Test_ObjRef::reset_parameters (void) { // Environemnt variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -136,7 +136,7 @@ Test_ObjRef::reset_parameters (void) ACE_TRY { // set the attribute of the object - this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object + this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object ACE_TRY_CHECK; } ACE_CATCHANY @@ -155,7 +155,7 @@ Test_ObjRef::reset_parameters (void) int Test_ObjRef::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -164,7 +164,7 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_objref (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -183,7 +183,7 @@ CORBA::Boolean Test_ObjRef::check_validity (void) { // Environemnt variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -193,24 +193,24 @@ Test_ObjRef::check_validity (void) || CORBA::is_nil (this->ret_.in ())) return 0; Coffee::Desc_var in_desc = - this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *out = out_desc->name.in (); - Coffee::Desc_var ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char* ret = ret_desc->name.in (); @@ -241,7 +241,7 @@ void Test_ObjRef::print_values (void) { // Env. variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; Coffee::Desc_var ret_desc; const char *in = 0; @@ -250,23 +250,23 @@ Test_ObjRef::print_values (void) ACE_TRY { Coffee::Desc_var in_desc = - this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out = out_desc->name.in (); - ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + ret_desc = this->out_->description (ACE_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 fb03eb03ac2..023829729fc 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 4489417361f..35b97524b65 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -49,7 +49,7 @@ Test_Objref_Struct::opname (void) const void Test_Objref_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Objref_Struct *tmp; @@ -65,13 +65,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Objref_Struct (*tmp); @@ -79,7 +79,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req int Test_Objref_Struct::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -88,14 +88,14 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_.y = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc d; d.name = gen->gen_string (); this->in_.y->description (d - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->inout_->x = 0; @@ -136,7 +136,7 @@ Test_Objref_Struct::reset_parameters (void) int Test_Objref_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -145,7 +145,7 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_objref_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -180,16 +180,16 @@ Test_Objref_Struct::check_validity (void) return 0; } - Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_ret = this->ret_->y->description (ACE_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 )); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_ret = this->ret_->y->description (ACE_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 2f517ef9b6f..8a2aaf06665 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 689e66c5c81..09e993346be 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) +Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee::Desc *desc = new Coffee::Desc; @@ -46,7 +46,7 @@ Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) // set attribute void Coffee_i::description (const Coffee::Desc &description - TAO_ENV_ARG_DECL_NOT_USED /*env*/) + ACE_ENV_ARG_DECL_NOT_USED /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (description.name); @@ -75,7 +75,7 @@ CORBA::Short Param_Test_i::test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = (CORBA::Short) (s1 * 2); @@ -94,7 +94,7 @@ CORBA::ULongLong Param_Test_i::test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; @@ -109,7 +109,7 @@ char * Param_Test_i::test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -128,7 +128,7 @@ char * Param_Test_i::test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -147,7 +147,7 @@ CORBA::WChar * Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -170,7 +170,7 @@ CORBA::WChar * Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -191,7 +191,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1; @@ -205,7 +205,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Long_Seq @@ -223,7 +223,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Short_Seq @@ -241,7 +241,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Short_Seq @@ -259,7 +259,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Long_Seq @@ -277,7 +277,7 @@ Param_Test::StrSeq * Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, Param_Test::StrSeq &s2, Param_Test::StrSeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -313,7 +313,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -334,7 +334,7 @@ Param_Test::WStrSeq * Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1, Param_Test::WStrSeq &ws2, Param_Test::WStrSeq_out ws3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -355,7 +355,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -377,7 +377,7 @@ Param_Test::StructSeq * Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::StructSeq &s2, Param_Test::StructSeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -400,7 +400,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_StructSeq @@ -419,7 +419,7 @@ Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, Param_Test::PathSpec_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::PathSpec @@ -452,7 +452,7 @@ Param_Test::ArraySeq * Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::ArraySeq &s2, Param_Test::ArraySeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -475,7 +475,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_ArraySeq @@ -493,7 +493,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Coffee_Mix @@ -536,7 +536,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Coffee_Mix @@ -579,7 +579,7 @@ Param_Test::AnySeq * Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1, Param_Test::AnySeq &s2, Param_Test::AnySeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -603,7 +603,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -625,7 +625,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -647,7 +647,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" structs into all the inout, out and return sequences. @@ -668,7 +668,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -687,10 +687,10 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr -Param_Test_i::make_coffee (TAO_ENV_SINGLE_ARG_DECL) +Param_Test_i::make_coffee (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER); } // test for object references @@ -698,21 +698,21 @@ Coffee_ptr Param_Test_i::test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee_ptr ret = Coffee::_nil (); ACE_TRY { - Coffee_var myobj = obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee_var myobj = obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (o2)) CORBA::release (o2); CORBA::Boolean equiv = myobj->_is_equivalent (o1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (equiv) @@ -747,7 +747,7 @@ CORBA::TypeCode_ptr Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &t2, CORBA::TypeCode_out t3 - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { // we simply assign t1 to the others @@ -762,7 +762,7 @@ CORBA::Any * Param_Test_i::test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + int kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -929,7 +929,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Fixed_Array_slice *ret; @@ -945,7 +945,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Var_Array_slice *ret; @@ -960,7 +960,7 @@ CORBA::ULong Param_Test_i::test_exception (CORBA::ULong s1, CORBA::ULong& s2, CORBA::ULong_out s3 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->throw_badboy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 0; @@ -991,7 +991,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1)); @@ -1004,7 +1004,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u2 = u1; @@ -1016,7 +1016,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1)); @@ -1029,7 +1029,7 @@ CORBA::Any* Param_Test_i::test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret (new CORBA::Any (a1)); @@ -1042,7 +1042,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Param_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } void -Param_Test_i::throw_badboy (TAO_ENV_SINGLE_ARG_DECL) +Param_Test_i::throw_badboy (ACE_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 31ba05dedf1..219f2b2c1ea 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual Coffee::Desc * description (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // get attribute virtual void description (const Coffee::Desc &description - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // set attribute @@ -63,42 +63,42 @@ public: virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded wstrings @@ -106,7 +106,7 @@ public: test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, Param_Test::Fixed_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed structures @@ -115,97 +115,97 @@ public: const Param_Test::Long_Seq & s1, Param_Test::Long_Seq & s2, Param_Test::Long_Seq_out s3 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // = End of sequences tests.... @@ -213,7 +213,7 @@ public: test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, Param_Test::Var_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for variable structs @@ -221,7 +221,7 @@ public: test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, Param_Test::Nested_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for nested structs @@ -229,7 +229,7 @@ public: test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, Param_Test::Recursive_Struct_out rs3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for recursive structs @@ -237,11 +237,11 @@ public: test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, Param_Test::Objref_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Coffee_ptr - make_coffee (TAO_ENV_SINGLE_ARG_DECL) + make_coffee (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // make a coffee object @@ -249,7 +249,7 @@ public: test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for object references @@ -257,7 +257,7 @@ public: test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, CORBA::TypeCode_out o3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for typecodes @@ -265,7 +265,7 @@ public: test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for Anys @@ -273,7 +273,7 @@ public: test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, Param_Test::Fixed_Array_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed size arrays @@ -281,14 +281,14 @@ public: test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, Param_Test::Var_Array_out a3 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)); @@ -296,28 +296,28 @@ public: test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, Param_Test::Big_Union_out u3 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test for multi dimensional arrays @@ -325,10 +325,10 @@ public: test_multdim_array (const Param_Test::Multdim_Array, Param_Test::Multdim_Array , Param_Test::Multdim_Array_out - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void throw_badboy (ACE_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 cbe8190640b..1e4f34d3f65 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -48,7 +48,7 @@ Test_Recursive_Struct::opname (void) const void Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Struct *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Struct (*tmp); @@ -78,7 +78,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req int Test_Recursive_Struct::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -117,7 +117,7 @@ Test_Recursive_Struct::reset_parameters (void) int Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -126,7 +126,7 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_recursive_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 9837523a401..18175cb53bd 100644 --- a/TAO/tests/Param_Test/recursive_struct.h +++ b/TAO/tests/Param_Test/recursive_struct.h @@ -36,14 +36,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -59,7 +59,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 1c9ec710040..b868c76ee54 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -48,7 +48,7 @@ Test_Recursive_Union::opname (void) const void Test_Recursive_Union::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Union *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Union (*tmp); @@ -78,7 +78,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req int Test_Recursive_Union::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -119,7 +119,7 @@ Test_Recursive_Union::reset_parameters (void) int Test_Recursive_Union::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -128,7 +128,7 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_recursive_union (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 33870fecbf6..5ebeaac1dd7 100644 --- a/TAO/tests/Param_Test/recursive_union.h +++ b/TAO/tests/Param_Test/recursive_union.h @@ -36,14 +36,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -59,7 +59,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 23ce8f75a3e..481e82837e3 100644 --- a/TAO/tests/Param_Test/results.cpp +++ b/TAO/tests/Param_Test/results.cpp @@ -103,7 +103,7 @@ Results::print_stats (void) void Results::print_exception (const char * /* call_name */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 81225cd2d01..e4cf1941a26 100644 --- a/TAO/tests/Param_Test/results.h +++ b/TAO/tests/Param_Test/results.h @@ -39,7 +39,7 @@ public: // prints the time stats void print_exception (const char *call_name - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 2fa7b83009e..d148bb4fa2d 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; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { const char *orb_name = ""; CORBA::ORB_var orb_ptr = - CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var temp; // holder for the myriad of times we get @@ -75,7 +75,7 @@ main (int argc, char *argv[]) // Get the Root POA temp = orb_ptr->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (temp.in())) @@ -83,21 +83,21 @@ main (int argc, char *argv[]) "(%P|%t) Unable to get root poa reference.\n"), 1); - oa_ptr = PortableServer::POA::_narrow (temp.in() TAO_ENV_ARG_PARAMETER); + oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - oa_ptr->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + oa_ptr->the_POAManager (ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); policies[1] = oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // We use a different POA, otherwise the user would have to // change the object key each time it invokes the server. @@ -105,7 +105,7 @@ main (int argc, char *argv[]) oa_ptr->create_POA ("child_poa", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse remaining command line and verify parameters. @@ -124,19 +124,19 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("param_test"); good_poa->activate_object_with_id (id.in (), param_test - TAO_ENV_ARG_PARAMETER); + ACE_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 () TAO_ENV_ARG_PARAMETER); + temp = good_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb_ptr->object_to_string (temp.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb_ptr->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_ptr->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; good_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; oa_ptr->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_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 6c906cbbadd..68d02b1db10 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -44,7 +44,7 @@ Test_Short::opname (void) const void Test_Short::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } int Test_Short::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -90,14 +90,14 @@ Test_Short::reset_parameters (void) int Test_Short::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_short (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_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 2304e0f2671..5157b673c74 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 555e42c38c8..6c05b360cbb 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -46,7 +46,7 @@ Test_Small_Union::opname (void) const void Test_Small_Union::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Small_Union *tmp; @@ -62,13 +62,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Small_Union (*tmp); @@ -76,12 +76,12 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req int Test_Small_Union::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -130,14 +130,14 @@ Test_Small_Union::reset_parameters (void) int Test_Small_Union::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_small_union (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_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 0e6124c80e3..bea055565b4 100644 --- a/TAO/tests/Param_Test/small_union.h +++ b/TAO/tests/Param_Test/small_union.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 23972a2ef3f..44b891b6ac9 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -44,7 +44,7 @@ Test_TypeCode::opname (void) const void Test_TypeCode::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_ptr tmp; @@ -60,13 +60,13 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::TypeCode::_duplicate (tmp); @@ -74,7 +74,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req int Test_TypeCode::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { static CORBA::TypeCode_ptr tc_table [] = { @@ -116,11 +116,11 @@ Test_TypeCode::reset_parameters (void) int Test_TypeCode::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - this->init_parameters (objref TAO_ENV_ARG_PARAMETER); + this->init_parameters (objref ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_out out (this->out_); @@ -128,7 +128,7 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_typecode (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean one, two, three; one = this->in_.in ()->equal (this->inout_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; two = this->in_.in ()->equal (this->out_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; three = this->in_.in ()->equal (this->ret_.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 4181f902805..bb369324d6e 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 a05bc294abc..e755c773a7f 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -52,7 +52,7 @@ Test_AnySeq::opname (void) const void Test_AnySeq::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::AnySeq* tmp; @@ -68,13 +68,13 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::AnySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::AnySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::AnySeq (*tmp); @@ -82,7 +82,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req int Test_AnySeq::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee_var cobj = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // insert the coffee object into the Any @@ -198,7 +198,7 @@ Test_AnySeq::reset_parameters (void) int Test_AnySeq::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -207,7 +207,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_anyseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 d7087b969b0..7b1efefb875 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 a4534a5129a..c662ac224c4 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -47,7 +47,7 @@ Test_Array_Sequence::opname (void) const void Test_Array_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::ArraySeq *tmp; @@ -63,13 +63,13 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::ArraySeq (*tmp); @@ -77,7 +77,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req int Test_Array_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -126,7 +126,7 @@ Test_Array_Sequence::reset_parameters (void) int Test_Array_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -135,7 +135,7 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_array_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 855c2c27565..ce888926d2e 100644 --- a/TAO/tests/Param_Test/ub_array_seq.h +++ b/TAO/tests/Param_Test/ub_array_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 eeae63f57e9..d14d272722c 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -48,7 +48,7 @@ Test_Long_Sequence::opname (void) const void Test_Long_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Long_Seq *tmp; @@ -64,13 +64,13 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = Param_Test::Long_Seq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Param_Test::Long_Seq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = Param_Test::Long_Seq (*tmp); @@ -78,7 +78,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req int Test_Long_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -108,7 +108,7 @@ Test_Long_Sequence::reset_parameters (void) int Test_Long_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -117,7 +117,7 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_long_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 133930584f0..a73f8d4adfe 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 99a8e7f0761..15e8b9a6cba 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -58,7 +58,7 @@ Test_ObjRef_Sequence::opname (void) const void Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Coffee_Mix *tmp; @@ -74,13 +74,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Coffee_Mix (*tmp); @@ -88,7 +88,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req int Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_[i] = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // select a Coffee flavor at random @@ -117,7 +117,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref Coffee_ptr tmp = this->in_[i]; tmp->description (desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -144,7 +144,7 @@ Test_ObjRef_Sequence::reset_parameters (void) int Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -153,7 +153,7 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_coffe_mix (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->compare (this->in_, this->inout_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->compare (this->in_, this->out_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->compare (this->in_, this->ret_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 1; @@ -233,7 +233,7 @@ Test_ObjRef_Sequence::print_values (void) CORBA::Boolean Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, const Param_Test::Coffee_Mix &s2 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var desc1 = vs1->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var n1 = desc1->name.in (); - Coffee::Desc_var desc2 = vs2->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var desc2 = vs2->description (ACE_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 1955fbfdeb1..f087101b08b 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 b6d97bb5af4..519c5687ee6 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -48,7 +48,7 @@ Test_Short_Sequence::opname (void) const void Test_Short_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Short_Seq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Short_Seq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Short_Seq (*tmp); @@ -78,7 +78,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req int Test_Short_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -110,7 +110,7 @@ Test_Short_Sequence::reset_parameters (void) int Test_Short_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -119,7 +119,7 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_short_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 f15ccbe0bb2..5f433fba4e0 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 a7bb6108914..8d85803ab37 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -48,7 +48,7 @@ Test_String_Sequence::opname (void) const void Test_String_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StrSeq *tmp; @@ -64,13 +64,13 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::StrSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StrSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StrSeq (*tmp); @@ -78,7 +78,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req int Test_String_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const char *choiceList[] = { @@ -114,7 +114,7 @@ Test_String_Sequence::reset_parameters (void) int Test_String_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -123,7 +123,7 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_strseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 5193a92a113..78f9c6f60f2 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 ff695b3e18e..f378c212fa6 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -56,7 +56,7 @@ Test_Unbounded_String::opname (void) const void Test_Unbounded_String::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *tmp; @@ -75,13 +75,13 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::string_dup (tmp); @@ -89,7 +89,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req int Test_Unbounded_String::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -126,7 +126,7 @@ Test_Unbounded_String::reset_parameters (void) int Test_Unbounded_String::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -135,7 +135,7 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_unbounded_string (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_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 12b02c4af4a..ed721972028 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 be2efce2d3d..cbf69675ddc 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -49,7 +49,7 @@ Test_Struct_Sequence::opname (void) const void Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StructSeq *tmp; @@ -65,13 +65,13 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StructSeq (*tmp); @@ -79,7 +79,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req int Test_Struct_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -111,7 +111,7 @@ Test_Struct_Sequence::reset_parameters (void) int Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -120,7 +120,7 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_struct_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -256,7 +256,7 @@ Test_Unbounded_Struct_Sequence::opname (void) const void Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::PathSpec *tmp; @@ -272,13 +272,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::PathSpec (*tmp); @@ -286,7 +286,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req int Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -319,13 +319,13 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) int Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Param_Test::PathSpec_out out (this->out_.out ()); this->ret_ = objref->test_unbounded_struct_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 546d1e95854..00ce057526d 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: @@ -98,14 +98,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 15852c15044..d5494df60fa 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -48,7 +48,7 @@ Test_WString_Sequence::opname (void) const void Test_WString_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::WStrSeq *tmp; @@ -64,13 +64,13 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::WStrSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::WStrSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::WStrSeq (*tmp); @@ -78,7 +78,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req int Test_WString_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -109,7 +109,7 @@ Test_WString_Sequence::reset_parameters (void) int Test_WString_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -118,7 +118,7 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_wstrseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 9e45909609d..c691018765d 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 255e49b96b0..bfb398c2259 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -56,7 +56,7 @@ Test_Unbounded_WString::opname (void) const void Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::WChar *tmp; @@ -75,13 +75,13 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::wstring_dup (tmp); @@ -89,7 +89,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req int Test_Unbounded_WString::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,7 +125,7 @@ Test_Unbounded_WString::reset_parameters (void) int Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_unbounded_wstring (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_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 5f53c7e707a..04497648c11 100644 --- a/TAO/tests/Param_Test/ub_wstring.h +++ b/TAO/tests/Param_Test/ub_wstring.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 05360195cb3..e491c76d9f2 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -40,7 +40,7 @@ Test_ULongLong::opname (void) const void Test_ULongLong::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } int Test_ULongLong::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -86,14 +86,14 @@ Test_ULongLong::reset_parameters (void) int Test_ULongLong::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_ulonglong (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index 6deae313e01..db9e1fa86a4 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -31,14 +31,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 7a429a50a7e..997600b7479 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -46,7 +46,7 @@ Test_Var_Array::opname (void) const void Test_Var_Array::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Var_Array_forany forany; @@ -63,13 +63,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= forany; this->out_ = Param_Test::Var_Array_dup (forany.in ()); @@ -77,7 +77,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req int Test_Var_Array::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -104,7 +104,7 @@ Test_Var_Array::reset_parameters (void) int Test_Var_Array::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -112,7 +112,7 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_var_array (this->in_, this->inout_, out_arr - TAO_ENV_ARG_PARAMETER); + ACE_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 3bf6bff5e66..07d33162104 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_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 849d80bcb16..ff644037acc 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -49,7 +49,7 @@ Test_Var_Struct::opname (void) const void Test_Var_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Var_Struct *tmp; @@ -65,13 +65,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Var_Struct (*tmp); @@ -79,7 +79,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req int Test_Var_Struct::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -134,7 +134,7 @@ Test_Var_Struct::reset_parameters (void) int Test_Var_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -142,7 +142,7 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_var_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_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 f7a4228bdef..aab34fe5247 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_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 * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: |