From caf63f452bc42dd56b2d505a5581c9d81a34a11f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 6 Jan 2017 18:47:38 +0100 Subject: Fixed last any extraction * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp: * TAO/tests/Param_Test/param_test_i.cpp: --- TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp | 3 ++- TAO/tests/Param_Test/param_test_i.cpp | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'TAO') diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index c66ccf0fffa..1e1c519b9d9 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -535,7 +535,8 @@ DII_Cubit_Client::cube_struct_dii (void) // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_struct")); - const Cubit::Many arg_struct, *ret_struct_ptr; + Cubit::Many arg_struct; + const Cubit::Many*ret_struct_ptr; arg_struct.l = 5; arg_struct.s = -7; diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index c9430b17d6c..49385975f6c 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -769,10 +769,11 @@ Param_Test_i::test_any (const CORBA::Any &a1, ACE_DEBUG ((LM_DEBUG, " %d", (*ub_short_sequence)[i])); ACE_DEBUG ((LM_DEBUG, "\n")); } + CORBA::ShortSeq newseq (*ub_short_sequence); for (size_t i = 0; i < ub_short_sequence->length (); i++) - (*ub_short_sequence)[i] = (CORBA::Short) (i * i); - a2 <<= *ub_short_sequence; - *ret <<= *ub_short_sequence; + newseq[i] = (CORBA::Short) (i * i); + a2 <<= newseq; + *ret <<= newseq; } else if (a1 >>= bd_short_sequence) { @@ -783,10 +784,11 @@ Param_Test_i::test_any (const CORBA::Any &a1, ACE_DEBUG ((LM_DEBUG, " %d", (*bd_short_sequence)[i])); ACE_DEBUG ((LM_DEBUG, "\n")); } + Param_Test::Bounded_Short_Seq newseq (*bd_short_sequence); for (size_t i = 0; i < bd_short_sequence->length (); i++) - (*bd_short_sequence)[i] = (CORBA::Short) (i * i); - a2 <<= *bd_short_sequence; - *ret <<= *bd_short_sequence; + newseq[i] = (CORBA::Short) (i * i); + a2 <<= newseq; + *ret <<= newseq; } else if (a1 >>= fixed_structure) { -- cgit v1.2.1