diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 12:18:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 12:18:24 +0000 |
| commit | e1dee65fd37eb568d8c68d49e909a4dd349d2b5a (patch) | |
| tree | d3e67a987ae49eda0c83f0aa771a26885bb689e9 | |
| parent | dd1cec961422d683dfb7d7a3d324d974e2961198 (diff) | |
| download | ATCD-e1dee65fd37eb568d8c68d49e909a4dd349d2b5a.tar.gz | |
Mon Dec 4 12:17:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tests/Bug_2709_Regression/Client_Task.cpp | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3a3604e33dc..72654f8bf62 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 4 12:17:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_2709_Regression/Client_Task.cpp: + Fixed conversion warning in vxworks builds + Mon Dec 4 11:21:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PI_Server/PortableServer_ORBInitializer.cpp: diff --git a/TAO/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/tests/Bug_2709_Regression/Client_Task.cpp index fb20b56589f..a735418a945 100644 --- a/TAO/tests/Bug_2709_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2709_Regression/Client_Task.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "TestC.h" #include "Client_Task.h" @@ -29,7 +29,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA: if (CORBA::is_nil (remote_server.in ())) { ACE_ERROR ((LM_ERROR, "Error: Remote server is not started.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + ACE_TRY_THROW (CORBA::INTERNAL ()); } CORBA::Object_var collocated_server( @@ -37,8 +37,8 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA: if (CORBA::is_nil (collocated_server.in ())) { - ACE_ERROR ((LM_ERROR, "Error: Collocated server is not started.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + ACE_ERROR ((LM_ERROR, "Error: Collocated server is not started.\n")); + ACE_TRY_THROW (CORBA::INTERNAL ()); } FT::TagFTGroupTaggedComponent ft_tag_component; @@ -47,7 +47,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA: TAO_IOP::TAO_IOR_Manipulation::IORList iors (1); iors.length (2); iors [0] = CORBA::Object::_duplicate (remote_server.ptr()); - iors [1] = CORBA::Object::_duplicate (collocated_server.ptr()); + iors [1] = CORBA::Object::_duplicate (collocated_server.ptr()); CORBA::Object_var new_ref = this->iorm_->merge_iors (iors ACE_ENV_ARG_PARAMETER); @@ -113,7 +113,7 @@ int Client_Task::svc (void) ACE_TRY_CHECK; CORBA::Object_var object = - corb_->string_to_object (iorgr_string ACE_ENV_ARG_PARAMETER); + corb_->string_to_object (iorgr_string.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = @@ -150,7 +150,7 @@ int Client_Task::svc (void) { // Following call will fail if the problem is not fixed. - // Because we are using TRANSIENT objects with the SYSTEM_ID policy + // Because we are using TRANSIENT objects with the SYSTEM_ID policy // the object keys won't match so the POA won't be able to dispatch locally. // This wouldn't work with 'direct' collocation strategy but the default is 'through poa'. server->myMethod (ACE_ENV_SINGLE_ARG_PARAMETER); |