diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-14 08:12:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-14 08:12:54 +0000 |
| commit | 428e70d52289b81a0c0783dcd5a4ec34fd5fd2b7 (patch) | |
| tree | 2d56024045df110aaeeeb9c3a7c49deeea7ae330 | |
| parent | 9273f317474bb8e417db6802d1b2cf802ae223b4 (diff) | |
| download | ATCD-428e70d52289b81a0c0783dcd5a4ec34fd5fd2b7.tar.gz | |
Wed Mar 14 08:12:52 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/DynUnion_Test/DynUnionTest.cpp | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 18d55cc19b6..c894d617e27 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 14 08:12:52 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/DynUnion_Test/DynUnionTest.cpp: + Fixed conversion warnings + Tue Mar 14 05:32:38 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * tao/Array_Traits_T.h (copy_range): @@ -11,7 +16,7 @@ Tue Mar 13 20:05:54 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/tests/Simple_Naming/client.cpp: Modified this test to use explicit activation to support - CORBA e compact. + CORBA e compact. Tue Mar 13 18:42:44 UTC 2007 Chad Elliott <elliott_c@ociweb.com> diff --git a/TAO/tests/DynUnion_Test/DynUnionTest.cpp b/TAO/tests/DynUnion_Test/DynUnionTest.cpp index 33aaba5e308..fbe7e648fde 100644 --- a/TAO/tests/DynUnion_Test/DynUnionTest.cpp +++ b/TAO/tests/DynUnion_Test/DynUnionTest.cpp @@ -13,7 +13,7 @@ int runStatic(CORBA::ORB_ptr orb) orb->resolve_initial_references("DynAnyFactory"); DynamicAny::DynAnyFactory_var dfact = - DynamicAny::DynAnyFactory::_narrow(obj); + DynamicAny::DynAnyFactory::_narrow(obj.in ()); if (CORBA::is_nil (dfact.in ())) { @@ -26,12 +26,12 @@ int runStatic(CORBA::ORB_ptr orb) dfact->create_dyn_any_from_type_code(DynAnyTest::_tc_EventData); DynamicAny::DynUnion_var dunion = - DynamicAny::DynUnion::_narrow(dany); + DynamicAny::DynUnion::_narrow(dany.in ()); DynamicAny::DynAny_var disc = dunion->get_discriminator(); DynamicAny::DynEnum_var denum = - DynamicAny::DynEnum::_narrow(disc); + DynamicAny::DynEnum::_narrow(disc.in ()); if (CORBA::is_nil (denum.in ())) { @@ -95,7 +95,7 @@ int runDynamic(CORBA::ORB_ptr orb) eventDataTc = orb->create_union_tc("IDL:DynAnyTest/EventData:1.0", "EventData", - eventKindTc, + eventKindTc.in (), useq); // Now create DynUnion @@ -113,15 +113,15 @@ int runDynamic(CORBA::ORB_ptr orb) } DynamicAny::DynAny_var dany = - dfact->create_dyn_any_from_type_code(eventDataTc); + dfact->create_dyn_any_from_type_code(eventDataTc.in ()); DynamicAny::DynUnion_var dunion = - DynamicAny::DynUnion::_narrow(dany); + DynamicAny::DynUnion::_narrow(dany.in ()); DynamicAny::DynAny_var disc = dunion->get_discriminator(); DynamicAny::DynEnum_var denum = - DynamicAny::DynEnum::_narrow(disc); + DynamicAny::DynEnum::_narrow(disc.in ()); // This fails. The type of discriminator is ulong if (CORBA::is_nil (denum.in ())) |