summaryrefslogtreecommitdiff
path: root/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp')
-rw-r--r--modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
index 642bcb95025..a7122b21f53 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
+++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
@@ -26,7 +26,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl
// FOO methods
void
MyFoo_callback_exec_i::var_outs (
- const char * answer, CORBA::Double d_cmd, CORBA::Long l_cmd )
+ const char * /*answer*/, CORBA::Double d_cmd, CORBA::Long l_cmd )
{
if (d_cmd != 3.14)
{
@@ -68,7 +68,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl
"received the wrong struct, "
"expected key 'aaa', x = 10,"
" received key '%C' , x = %u\n",
- test_topic.key,test_topic.x));
+ test_topic.key.in(),test_topic.x));
error = true;
}
if (( ACE_OS::strcmp (topic_str.key,"bbb") != 0) ||
@@ -78,7 +78,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl
"received the wrong struct, "
"expected key 'bbb', x = 'ccc',"
" received key '%C' , x = %C\n",
- topic_str.key ,topic_str.x_str));
+ topic_str.key.in() ,topic_str.x_str.in()));
error = true;
}
if (( ACE_OS::strcmp (topic_arr.key,"ddd") != 0) ||
@@ -88,7 +88,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl
"received the wrong struct, "
"expected key 'ddd', second elem 100 ,"
" received key '%C', second elem %u\n",
- topic_arr.key, topic_arr.x_array[1]));
+ topic_arr.key.in(), topic_arr.x_array[1]));
error = true;
}
if (error == false)
@@ -127,7 +127,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl
"received the wrong sequence, "
"expected key 'fff', x = 12,"
" received key '%C' , x = %u\n",
- seq[0].x_teststr,seq[0].x_test));
+ seq[0].x_teststr.in(),seq[0].x_test));
error = true;
}
if (error == false)
@@ -147,8 +147,8 @@ namespace CIAO_InterOutArgsT_Sender_Impl
// Worker thread for asynchronous invocations for MyFoo
//============================================================
asynch_foo_generator::asynch_foo_generator (
- ::InterOutArgsT::AMI_MyFoo_ptr my_foo_ami)
- : my_foo_ami_ (::InterOutArgsT::AMI_MyFoo::_duplicate (my_foo_ami))
+ ::InterOutArgsT::AMI4CCM_MyFoo_ptr my_foo_ami)
+ : my_foo_ami_ (::InterOutArgsT::AMI4CCM_MyFoo::_duplicate (my_foo_ami))
{
}
@@ -264,7 +264,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl
void
Sender_exec_i::ccm_activate (void)
{
- ::InterOutArgsT::AMI_MyFoo_var asynch_foo =
+ ::InterOutArgsT::AMI4CCM_MyFoo_var asynch_foo =
this->context_->get_connection_sendc_run_my_foo();
asynch_foo_generator* asynch_foo_gen =
new asynch_foo_generator (asynch_foo);