diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:19 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:19 +0000 |
commit | e8cc76aad5f556c77963836aacfe813876795059 (patch) | |
tree | 17bf4f2a5f6e2e7edc70e8d4744da31f8b5478df /CIAO/connectors/ami4ccm/tests/InterReturn | |
parent | 1ce487d19726093c9362b63847f773cb1f4e6f2a (diff) | |
download | ATCD-e8cc76aad5f556c77963836aacfe813876795059.tar.gz |
Remove trailing whitespaces
Diffstat (limited to 'CIAO/connectors/ami4ccm/tests/InterReturn')
3 files changed, 15 insertions, 15 deletions
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl index 058690e907e..449b42cc722 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl @@ -20,7 +20,7 @@ module InterReturnT // Array struct TestArr { - string key; + string key; short_array x_array; }; diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp index 8093386f751..f032525c199 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp @@ -66,7 +66,7 @@ namespace CIAO_InterReturnT_Receiver_Impl for (CORBA::UShort y = 0; y < 5; y ++) { test_array[i].x_array[y] = i * 100 + y ; - } + } } return InterReturnT::TestArray_dup(test_array); } 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 63b3ab6956e..275b0f984c6 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp @@ -48,7 +48,7 @@ namespace CIAO_InterReturnT_Sender_Impl } void - MyFoo_callback_exec_i::ret_long (::CORBA::Long ami_return_val, + MyFoo_callback_exec_i::ret_long (::CORBA::Long ami_return_val, const char * /*answer*/, CORBA::Long l_cmd) { if ((l_cmd != 2) || (ami_return_val != 200)) @@ -190,7 +190,7 @@ namespace CIAO_InterReturnT_Sender_Impl MyFoo_callback_exec_i::ret_union ( const InterReturnT::X_Union &ami_return_val, const char * /*answer*/, CORBA::Long l_cmd) - { + { if ((l_cmd != 7) || (ami_return_val.x_long() != 11)) { ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_union: " @@ -253,12 +253,12 @@ namespace CIAO_InterReturnT_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else { - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_foo_ami_->sendc_ret_void (new MyFoo_callback_exec_i (), "Send me a void." ); my_foo_ami_->sendc_ret_long (new MyFoo_callback_exec_i (),"Send me a long."); my_foo_ami_->sendc_ret_double (new MyFoo_callback_exec_i (),"Send me a double."); @@ -294,21 +294,21 @@ namespace CIAO_InterReturnT_Sender_Impl CORBA::String_var out_str; try { - CORBA::Double ret = + CORBA::Double ret = my_foo_ami_->ret_double ("Send me synch double",out_str, l_cmd); if ( (ret == 3.14 ) && (l_cmd == 3)) { ++nr_of_received; } - } + } catch (const InterReturnT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_double: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } try { - InterReturnT::TestArray_slice *arr = + InterReturnT::TestArray_slice *arr = my_foo_ami_->ret_array ("Send me synch array",out_str.out (), l_cmd); ++arr; if ((l_cmd != 5) || (arr->x_array[2] != 102)) @@ -317,17 +317,17 @@ namespace CIAO_InterReturnT_Sender_Impl "received the wrong long or array, expected 5 " "and 102, received %u and %u\n", l_cmd, arr->x_array[2])); - } + } else { ++nr_of_received; } } - + catch (const InterReturnT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_array: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } return 0; } @@ -388,13 +388,13 @@ namespace CIAO_InterReturnT_Sender_Impl if (nr_of_received == 10) { ACE_DEBUG ((LM_DEBUG, "OK: Sender received all expected return data" - " for syn- and asynchronous calls\n")); + " for syn- and asynchronous calls\n")); } else { ACE_ERROR ((LM_ERROR, "ERROR: Sender didn't receive all expected" " return data for syn- and asynchronous" - " calls\n")); + " calls\n")); } } |