summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-03-01 19:22:22 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-03-01 19:22:22 +0100
commitc61394d69ad7c7fea1078ec5441514761fdbd0fb (patch)
tree51380cbf4c1be28c18e4ce55fda60a32a22b2b9f
parentf8dab2a45cce95c6165033efed159ec33397244e (diff)
parent7c0406b34ff014242860fbea62fc8c33b05f7696 (diff)
downloadATCD-c61394d69ad7c7fea1078ec5441514761fdbd0fb.tar.gz
Merge branch 'master' of git://github.com/DOCGroup/ATCD
-rw-r--r--TAO/tests/DynAny_Test/test_dynany.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 25cf051ad54..5f68a153d78 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -72,7 +72,7 @@ Test_DynAny::run_test (void)
DynamicAny::DynAny_var fa1 =
dynany_factory->create_dyn_any (in1);
- if (fa1->equal(fa1))
+ if (fa1->equal(fa1.in ()))
{
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
@@ -138,7 +138,7 @@ Test_DynAny::run_test (void)
DynamicAny::DynAny_var fa1 =
dynany_factory->create_dyn_any (in1);
- if (fa1->equal(fa1))
+ if (fa1->equal(fa1.in ()))
{
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
@@ -347,7 +347,7 @@ Test_DynAny::run_test (void)
dynany_factory->create_dyn_any (in4);
// is equal to self
- good = fa4->equal(fa4);
+ good = fa4->equal(fa4.in ());
CORBA::ShortSeq ss5;
ss5.length(1);
@@ -358,7 +358,7 @@ Test_DynAny::run_test (void)
dynany_factory->create_dyn_any (in5);
// is not equal for different lengths
- good = good && !fa4->equal(fa5);
+ good = good && !fa4->equal(fa5.in ());
CORBA::ShortSeq ss6(data.m_shortseq1);
ss6[0]++;
@@ -369,7 +369,7 @@ Test_DynAny::run_test (void)
dynany_factory->create_dyn_any (in6);
// is not equal for different values
- good = good && !fa4->equal(fa6);
+ good = good && !fa4->equal(fa6.in ());
CORBA::Any in7;
@@ -379,7 +379,7 @@ Test_DynAny::run_test (void)
// is equal to identical sequence, not self
- good = good && fa4->equal(fa7);
+ good = good && fa4->equal(fa7.in ());
if (good)