From ef901dac59e771b8872ae9eab70296166ab07882 Mon Sep 17 00:00:00 2001 From: dengg Date: Fri, 15 Apr 2005 16:39:04 +0000 Subject: Fri Apr 15 10:46:56 CDT 2005 Gan Deng --- TAO/CIAO/ChangeLog | 6 ++++++ TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp | 5 +++-- .../DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp | 5 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 5abb2a8b586..2baf8f953b2 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -12,6 +12,12 @@ Fri Apr 15 10:46:56 CDT 2005 Gan Deng Fixed a warning message. + * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp + * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp + + This should fix the warning message on Dynamic_Hash_Op_Lookup + build. + Thu Apr 14 10:54:56 CDT 2005 Will Otte * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp index d5b1046bafe..4f354a7c007 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp @@ -95,10 +95,11 @@ main (int argc, char *argv[]) assert (comp_info->length () == 1); //return 1 component objeref const CORBA::ULong i = 0; - Components::CCMObject_ptr objref = (comp_info[i]).component_ref; + Components::CCMObject_var objref = (comp_info[i]).component_ref; NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = - NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref ACE_ENV_ARG_PARAMETER); + NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip_var.in ())) diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp index b98abb50912..a042b9f7370 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp @@ -95,10 +95,11 @@ main (int argc, char *argv[]) assert (comp_info->length () == 1); //return 1 component objeref const CORBA::ULong i = 0; - Components::CCMObject_ptr objref = (comp_info[i]).component_ref; + Components::CCMObject_var objref = (comp_info[i]).component_ref; NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = - NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref ACE_ENV_ARG_PARAMETER); + NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip_var.in ())) -- cgit v1.2.1