diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-15 16:39:04 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-15 16:39:04 +0000 |
| commit | ef901dac59e771b8872ae9eab70296166ab07882 (patch) | |
| tree | 339a5a736b0aea0069f581b1a94a69f5fa843214 | |
| parent | cc2da13d5b5e7c985260b7a8cb8818a8400284c8 (diff) | |
| download | ATCD-ef901dac59e771b8872ae9eab70296166ab07882.tar.gz | |
Fri Apr 15 10:46:56 CDT 2005 Gan Deng <dengg@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp | 5 | ||||
| -rw-r--r-- | TAO/CIAO/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 <dengg@dre.vanderbilt.edu> 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 <wotte@dre.vanderbilt.edu> * 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 ())) |