diff options
| author | mhengstmengel <mhengstmengel@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-12-20 10:11:47 +0000 |
|---|---|---|
| committer | mhengstmengel <mhengstmengel@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-12-20 10:11:47 +0000 |
| commit | 7755bcf95db8cb978ed07763af7e4d499dce0198 (patch) | |
| tree | 9c5805117738a29418ef95480620f16c62bb83c2 /CIAO/connectors/ami4ccm/tests/InterReturn | |
| parent | 80e83c8e5c8ab542b43036414a69ce62ea180a79 (diff) | |
| download | ATCD-7755bcf95db8cb978ed07763af7e4d499dce0198.tar.gz | |
Tue Dec 20 09:10:05 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp:
Solved valgrind errors.
Diffstat (limited to 'CIAO/connectors/ami4ccm/tests/InterReturn')
| -rw-r--r-- | CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp index 2ba759d2d7a..bfdd02d4e06 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp @@ -110,7 +110,7 @@ namespace CIAO_InterReturnT_Sender_Impl } try { - InterReturnT::TestArray_slice *arr = + InterReturnT::TestArray_slice * arr = my_foo_ami_->ret_array ("Send me synch array",out_str, l_cmd); if ((l_cmd != 5) || (arr[1].x_array[2] != 102)) { @@ -137,7 +137,7 @@ namespace CIAO_InterReturnT_Sender_Impl } - InterReturnT::TestStruct *struct_return_val = + InterReturnT::TestStruct_var struct_return_val = my_foo_ami_->ret_struct ("Send me synch struct",out_str, l_cmd); if (l_cmd != 4) { @@ -160,9 +160,9 @@ namespace CIAO_InterReturnT_Sender_Impl ++this->nr_of_received_; } - const InterReturnT::TestSeq *seq_return_val = + const InterReturnT::TestSeq_var seq_return_val = my_foo_ami_->ret_seq ("Send me synch struct",out_str, l_cmd); - if ((l_cmd != 6) || (!seq_return_val)) + if ((l_cmd != 6)|| (CORBA::is_nil(seq_return_val))) { ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_seq: " "received the wrong long, expected 6," @@ -175,7 +175,7 @@ namespace CIAO_InterReturnT_Sender_Impl } - const InterReturnT::X_Union *union_return_val = + const InterReturnT::X_Union_var union_return_val = my_foo_ami_->ret_union ("Send me synch union",out_str, l_cmd); if ((l_cmd != 7) || (union_return_val->x_long() != 11)) { |