diff options
Diffstat (limited to 'TAO/tests')
43 files changed, 132 insertions, 125 deletions
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index db44317a840..52a160e2890 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -166,8 +166,8 @@ Test_Any::run_sii_test (Param_Test_ptr objref, } int -Test_Any::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Any::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (CORBA::_tc_any, &this->in_, 0); diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index 1e7fcd33ea0..21c61e6bb8d 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index 512b52a5113..bbcc675a3d2 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -85,8 +85,8 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Bounded_Long_Seq, (void *) &this->in_.in (), 0); diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index 60740ec451c..560e06385c7 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 6bdf8c99340..eef25c72b10 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -88,8 +88,8 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Bounded_Short_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Bounded_Short_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Bounded_Short_Seq, (void *) &this->in_.in (), 0); diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index 0741df0f63b..10e45316593 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index 470c7d8b2f7..4fd2683ba1d 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -98,8 +98,8 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Bounded_String_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Bounded_String_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Bounded_StrSeq, (void *) &this->in_.in (), 0); diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index ea21ee83b38..5e0c614dea6 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index 3fc6acff167..87bebcc7c3f 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -99,9 +99,9 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref, } int -Test_Bounded_String::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_Bounded_String::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { CORBA::Any in_arg (CORBA::_tc_string, &this->in_, 0); CORBA::Any inout_arg (CORBA::_tc_string, &this->inout_, 0); diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index 3490d9ab138..f49038764f6 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index 0b59ee167b9..a177068469e 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -91,9 +91,9 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Bounded_Struct_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_Bounded_Struct_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Bounded_StructSeq, (void *) &this->in_, 0); CORBA::Any inout_arg (Param_Test::_tc_Bounded_StructSeq, &this->inout_.inout (), 0); diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index 2ab6181926a..1684795a9da 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index e704adba847..c136c2aa8db 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -120,13 +120,9 @@ Param_Test_Client<T>::run_sii_test (void) template <class T> int Param_Test_Client<T>::run_dii_test (void) { - CORBA::ULong i; // loop index - CORBA::Request_ptr req; // DII request const char *opname = this->test_object_->opname (); Options *opt = OPTIONS::instance (); CORBA::Environment env; // environment - CORBA::NVList_ptr nvlist; // argument list for DII parameters - CORBA::NVList_ptr retval; // to access the NamedValue that stores the result // initialize call count and error count this->results_.call_count (0); @@ -141,7 +137,7 @@ Param_Test_Client<T>::run_dii_test (void) opname), -1); // Make the calls in a loop. - for (i = 0; i < opt->loop_count (); i++) + for (CORBA::ULong i = 0; i < opt->loop_count (); i++) { this->results_.call_count (this->results_.call_count () + 1); @@ -150,12 +146,18 @@ Param_Test_Client<T>::run_dii_test (void) this->results_.start_timer (); // first create the argument list (length 0 because args are *added*) + CORBA::NVList_ptr nvlist; + this->orb_->create_list (0, nvlist); + // then the result holder (length 1 because value is *replaced*) - this->orb_->create_list (1, retval); + CORBA::NVList_var retval; + this->orb_->create_list (1, retval.out ()); // add arguments and typecode for return valueto the NVList - if (this->test_object_->add_args (nvlist, retval, env) == -1) + if (this->test_object_->add_args (nvlist, + retval.in (), + env) == -1) { this->results_.error_count (this->results_.error_count () + 1); env.print_exception (opname); @@ -167,10 +169,13 @@ Param_Test_Client<T>::run_dii_test (void) } // create the request + CORBA::Request_var req; + CORBA::NamedValue_ptr result = + CORBA::NamedValue::_duplicate (retval->item (0, env)); this->param_test_->_create_request (opname, nvlist, - retval->item (0, env), - req, + result, + req.out (), 0, //CORBA::OUT_LIST_MEMORY, env); // The OUT_LIST_MEMORY is to be used when the ORB assumes that @@ -187,7 +192,6 @@ Param_Test_Client<T>::run_dii_test (void) { this->results_.error_count (this->results_.error_count () + 1); req->env ()->print_exception (opname); - CORBA::release (req); continue; } @@ -197,18 +201,15 @@ Param_Test_Client<T>::run_dii_test (void) this->test_object_->print_values (); } // now check if the values returned are as expected - if (!this->test_object_->check_validity (req)) + if (!this->test_object_->check_validity (req.in ())) { this->results_.error_count (this->results_.error_count () + 1); ACE_ERROR ((LM_ERROR, "(%N:%l) client.cpp - " "Invalid results in run_dii_test in iteration %d", i)); - CORBA::release (req); continue; } - // release the request - CORBA::release (req); // stop the this->results_. this->results_.stop_timer (); diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index f34294436b3..d8370828d54 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -84,8 +84,8 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref, } int -Test_Fixed_Array::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Fixed_Array::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { // We provide the top level memory diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index 994e3d07980..fc1f8ee5cc3 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index e781e449ef7..de3f5bdb3cf 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -74,8 +74,8 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref, } int -Test_Fixed_Struct::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Fixed_Struct::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { // We provide the top level memory diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index 75896d967fe..5e855e6e608 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index 81f367c0386..5d588f174e9 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -92,9 +92,9 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref, } int -Test_Nested_Struct::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_Nested_Struct::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Nested_Struct, (void *) &this->in_, 0); CORBA::Any inout_arg (Param_Test::_tc_Nested_Struct, &this->inout_.inout (), 0); diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index 29e6d52c898..e1c03654ed5 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 8de443cb568..727d4cd97e9 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -115,9 +115,9 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref, } int -Test_ObjRef::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_ObjRef::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { CORBA::Any in_arg (_tc_Coffee, &this->in_, 0); CORBA::Any inout_arg (_tc_Coffee, &this->inout_, 0); @@ -140,39 +140,42 @@ CORBA::Boolean Test_ObjRef::check_validity (void) { CORBA::Environment env; - char // attribute names - *in, - *inout, - *out, - *ret; - in = this->in_->description (env)->name; + Coffee::Desc_var in_desc = + this->in_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return 0; } + char* in = in_desc->name; - inout = this->inout_->description (env)->name; + Coffee::Desc_var inout_desc = + this->inout_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return 0; } + char* inout = inout_desc->name; - out = this->out_->description (env)->name; + Coffee::Desc_var out_desc = + this->out_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return 0; } + char* out = out_desc->name; - ret = this->ret_->description (env)->name; + Coffee::Desc_var ret_desc = + this->out_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return 0; } + char* ret = ret_desc->name; // now compare them if (!ACE_OS::strcmp (in, inout) && @@ -218,39 +221,43 @@ void Test_ObjRef::print_values (void) { CORBA::Environment env; - char // attribute names - *in, - *inout, - *out, - *ret; - in = this->in_->description (env)->name; + Coffee::Desc_var in_desc = + this->in_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return; } + char* in = in_desc->name; - inout = this->inout_->description (env)->name; + Coffee::Desc_var inout_desc = + this->inout_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return; } + char* inout = inout_desc->name; - out = this->out_->description (env)->name; + Coffee::Desc_var out_desc = + this->out_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return; } + char* out = out_desc->name; - ret = this->ret_->description (env)->name; + Coffee::Desc_var ret_desc = + this->out_->description (env); if (env.exception ()) { env.print_exception ("retrieving description"); return; } + char* ret = ret_desc->name; + ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*" diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index 0e4d21d12f5..8b95f005e3c 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index 7b25d0f52a2..66076f5e62f 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -74,8 +74,8 @@ Test_Short::run_sii_test (Param_Test_ptr objref, } int -Test_Short::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Short::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { // we provide top level memory to the ORB to retrieve the data diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index a6ba4799583..409bd805177 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index e0880b85bdc..4c4e0e7551e 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -89,9 +89,9 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref, } int -Test_TypeCode::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_TypeCode::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { return 0; } diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index c6f39c14241..1791c6e5aef 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index a387af2bc2c..c603c4bb1d4 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -165,8 +165,8 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref, } int -Test_AnySeq::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_AnySeq::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_AnySeq, (void *) &this->in_, 0); diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index d7850f6d9d7..878ce9d09e5 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index bfca9e1a137..d5510035c47 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -87,8 +87,8 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Long_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Long_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Long_Seq, (void *) &this->in_.in (), 0); diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index 27d0f6d33a8..3d68edce63c 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index 93e18b05ad7..fafb6213e1c 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -116,8 +116,8 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_ObjRef_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_ObjRef_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Coffee_Mix, (void *) &this->in_, 0); diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index 78e13f8fe8c..43b572a551b 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index 6f164a0c1ba..3aa0d249969 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -90,8 +90,8 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Short_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Short_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Short_Seq, (void *) &this->in_.in (), 0); diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index 87ae64745f2..96c37beeb48 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 1655358c54f..ec487e05059 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -103,8 +103,8 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_String_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_String_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_StrSeq, (void *) &this->in_.in (), 0); diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 010a30ceb69..cefe6f96eb6 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index cbca89185fa..8eb57429f7b 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -99,9 +99,9 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref, } int -Test_Unbounded_String::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_Unbounded_String::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { CORBA::Any in_arg (CORBA::_tc_string, &this->in_, 0); CORBA::Any inout_arg (CORBA::_tc_string, &this->inout_, 0); diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index 6538a7a9bd5..18bb253fd3a 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 11a510da242..f807f427abc 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -91,8 +91,8 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref, } int -Test_Struct_Sequence::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, +Test_Struct_Sequence::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_StructSeq, (void *) &this->in_, 0); diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 26b8a333490..92348e1cfcc 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -38,8 +38,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index de50a334b19..71758111d93 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -82,9 +82,9 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref, } int -Test_Var_Array::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_Var_Array::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { // We provide the top level memory // the Any does not own any of these diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index 6a716f4e88d..51abada9541 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -37,8 +37,8 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index b867b696542..ff49698d418 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -94,9 +94,9 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref, } int -Test_Var_Struct::add_args (CORBA::NVList_ptr ¶m_list, - CORBA::NVList_ptr &retval, - CORBA::Environment &env) +Test_Var_Struct::add_args (CORBA::NVList_ptr param_list, + CORBA::NVList_ptr retval, + CORBA::Environment &env) { CORBA::Any in_arg (Param_Test::_tc_Var_Struct, (void *) &this->in_, 0); CORBA::Any inout_arg (Param_Test::_tc_Var_Struct, &this->inout_.inout (), 0); diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index a3168eca57a..21e6e08900e 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -38,11 +38,10 @@ public: CORBA::Environment &env); // run the SII test - int add_args (CORBA::NVList_ptr &nvlist, - CORBA::NVList_ptr &retval, + int add_args (CORBA::NVList_ptr nvlist, + CORBA::NVList_ptr retval, CORBA::Environment &env); // add args to NVList for DII - const char *opname (void) const; // return operation name |