diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-12-20 10:11:47 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-12-20 10:11:47 +0000 |
| commit | 1b7117916ac3803e930debae46455ab7adff79dc (patch) | |
| tree | 9c5805117738a29418ef95480620f16c62bb83c2 | |
| parent | 4df62fc73e95a4eecb4231db27052bee91abfd71 (diff) | |
| download | ATCD-1b7117916ac3803e930debae46455ab7adff79dc.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.
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 67c993e9ea8..63a65834867 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +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. + Mon Dec 19 11:33:05 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * tests/DAnCE/NodeManager-Deployments/run_test.pl: @@ -14,8 +19,6 @@ Mon Dec 19 11:33:05 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> Splitted tests-runs in runs for noevent disabled and enabled. - - Sun Dec 18 11:36:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * bin/ciao_tests.lst: 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)) { |