diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-05 21:10:43 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-05 21:10:43 +0100 |
commit | 76684280776760657103f76bead4c57e4d3e99c1 (patch) | |
tree | cf1213d7fe0e8505a9d66e4a39ef8a4c219ecfbd /TAO/tests | |
parent | 7d8b0feae4bb77d4867eeaba358f690f6d0075e9 (diff) | |
download | ATCD-76684280776760657103f76bead4c57e4d3e99c1.tar.gz |
More any extraction changes
* TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp:
* TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
* TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h:
* TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
* TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp:
* TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp:
* TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp:
* TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp:
* TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
* TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h:
* TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp:
* TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp:
* TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h:
* TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
* TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
* TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
* TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h:
* TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
* TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h:
* TAO/tests/Bug_2678_Regression/server.cpp:
* TAO/tests/Codec/client.cpp:
* TAO/tests/Param_Test/complex_any.cpp:
* TAO/tests/Param_Test/param_test_i.cpp:
* TAO/tests/Param_Test/ub_struct_seq.cpp:
Diffstat (limited to 'TAO/tests')
-rw-r--r-- | TAO/tests/Bug_2678_Regression/server.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Codec/client.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Param_Test/complex_any.cpp | 12 | ||||
-rw-r--r-- | TAO/tests/Param_Test/param_test_i.cpp | 12 | ||||
-rw-r--r-- | TAO/tests/Param_Test/ub_struct_seq.cpp | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp index acc58355ae4..c81cf0d458c 100644 --- a/TAO/tests/Bug_2678_Regression/server.cpp +++ b/TAO/tests/Bug_2678_Regression/server.cpp @@ -30,7 +30,7 @@ AnySeq *Test_impl::RunTest(const AnySeq ¶ms) ACE_DEBUG ((LM_DEBUG, "RunTest: params.length == %d\n", params.length())); for (CORBA::ULong count = 0; count < params.length(); ++count) { - Container* container = 0; + const Container* container = 0; if (!(params[count] >>= container)) { ACE_ERROR ((LM_ERROR, "ERROR, failed extract\n")); diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index 70843f8f8d0..b9c96d35112 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -29,7 +29,7 @@ gen_wstring (CORBA::ULong max_length) } int -verify_data (Foo::Bar *original, Foo::Bar *extracted) +verify_data (Foo::Bar *original, const Foo::Bar *extracted) { if (!original || !extracted) return -1; diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 0fbb1b12eb7..7d3330c2258 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -215,8 +215,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq, for (CORBA::ULong i = 0; i < level2_in_seq->length (); i++) { - CORBA::AnySeq *level3_in_seq; - CORBA::AnySeq *level3_test_seq; + const CORBA::AnySeq *level3_in_seq = 0; + const CORBA::AnySeq *level3_test_seq = 0; if (!((*level2_in_seq)[i] >>= level3_in_seq)) return 0; @@ -232,8 +232,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq, for (CORBA::ULong j = 0; j < level3_in_seq->length (); j ++) { - Param_Test::level4 *level4_in_struct; - Param_Test::level4 *level4_test_struct; + const Param_Test::level4 *level4_in_struct = 0; + const Param_Test::level4 *level4_test_struct = 0; if (!((*level3_in_seq)[j] >>= level4_in_struct)) return 0; @@ -263,8 +263,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq, if (!((*level6_test_any) >>= level7_test_any)) return 0; - Param_Test::level8 *level8_in_struct; - Param_Test::level8 *level8_test_struct; + const Param_Test::level8 *level8_in_struct = 0; + const Param_Test::level8 *level8_test_struct = 0; if (!((*level7_in_any) >>= level8_in_struct)) return 0; diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 4993592dbb8..82b22d09cbd 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -701,10 +701,10 @@ Param_Test_i::test_any (const CORBA::Any &a1, Coffee_ptr coffee; Param_Test::Fixed_Array_forany array; CORBA::ShortSeq *ub_short_sequence; - Param_Test::Bounded_Short_Seq *bd_short_sequence; - Param_Test::Fixed_Struct *fixed_structure; - Param_Test::Big_Union *big_union; - Param_Test::Small_Union *small_union; + const Param_Test::Bounded_Short_Seq *bd_short_sequence; + const Param_Test::Fixed_Struct *fixed_structure; + const Param_Test::Big_Union *big_union; + const Param_Test::Small_Union *small_union; a2 = a1; a3 = new CORBA::Any (a1); @@ -795,7 +795,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, } else if (a1 >>= big_union) { - Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret; + const Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret; a1 >>= bu_in; // Insert copies.... @@ -821,7 +821,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, } else if (a1 >>= small_union) { - Param_Test::Small_Union *bu_in, *bu_inout, *bu_out, *bu_ret; + const Param_Test::Small_Union *bu_in, *bu_inout, *bu_out, *bu_ret; a1 >>= bu_in; // Insert copies.... diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 4c68746f8b8..7770f7fd5f5 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -248,7 +248,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req) req->invoke (); - Param_Test::PathSpec *tmp; + const Param_Test::PathSpec *tmp = 0; req->return_value () >>= tmp; this->ret_ = new Param_Test::PathSpec (*tmp); |