summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-29 21:50:24 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-29 21:50:24 +0000
commit1c1fa1f34bb016aa8ee0bcf315c763d538d68ca1 (patch)
tree7f134dd80422442d818dc01adfc6e12086a70c0b
parent2c0c98602ad32b8cd309b201097bcb10a16d3e0c (diff)
downloadATCD-1c1fa1f34bb016aa8ee0bcf315c763d538d68ca1.tar.gz
ChangeLogTag: Sat Jul 29 16:46:31 2000 Jeff Parsons <parsons@cs.wustl.edu>
-rw-r--r--TAO/tests/DynAny_Test/test_dynarray.cpp4
-rw-r--r--TAO/tests/DynAny_Test/test_dynenum.cpp2
-rw-r--r--TAO/tests/DynAny_Test/test_dynsequence.cpp2
-rw-r--r--TAO/tests/DynAny_Test/test_dynstruct.cpp2
-rw-r--r--TAO/tests/DynAny_Test/test_dynunion.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index f6b2263a9f4..37ca93795a9 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -58,9 +58,9 @@ Test_DynArray::run_test (void)
CORBA::Any in_any1;
in_any1 <<= ta;
CORBA_DynAny_var dp1 = this->orb_->create_dyn_any (in_any1,
- ACE_TRY_ENV);
+ ACE_TRY_ENV);
ACE_TRY_CHECK;
- CORBA_DynArray_var fa1 = CORBA_DynArray::_narrow (dp1,
+ CORBA_DynArray_var fa1 = CORBA_DynArray::_narrow (dp1.in (),
ACE_TRY_ENV);
ACE_TRY_CHECK;
fa1->seek (1,
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index d4f7c247516..38301c557f2 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -54,7 +54,7 @@ Test_DynEnum::run_test (void)
CORBA_DynAny_var dp1 = this->orb_->create_dyn_any (in_any1,
ACE_TRY_ENV);
ACE_TRY_CHECK;
- CORBA_DynEnum_var de1 = CORBA_DynEnum::_narrow (dp1,
+ CORBA_DynEnum_var de1 = CORBA_DynEnum::_narrow (dp1.in (),
ACE_TRY_ENV);
ACE_TRY_CHECK;
de1->value_as_ulong (2,
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index f67fe0021fc..26f969a7b35 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -64,7 +64,7 @@ Test_DynSequence::run_test (void)
this->orb_->create_dyn_any (in_any1,
ACE_TRY_ENV);
ACE_TRY_CHECK;
- CORBA_DynSequence_var fa1 = CORBA_DynSequence::_narrow (dp1,
+ CORBA_DynSequence_var fa1 = CORBA_DynSequence::_narrow (dp1.in (),
ACE_TRY_ENV);
ACE_TRY_CHECK;
fa1->seek (1,
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 0f07fbfbb42..483242c9433 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -61,7 +61,7 @@ Test_DynStruct::run_test (void)
this->orb_->create_dyn_any (in_any1,
ACE_TRY_ENV);
ACE_TRY_CHECK;
- CORBA_DynStruct_var fa1 = CORBA_DynStruct::_narrow (dp1,
+ CORBA_DynStruct_var fa1 = CORBA_DynStruct::_narrow (dp1.in (),
ACE_TRY_ENV);
ACE_TRY_CHECK;
fa1->insert_char (data.m_char1,
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 08b26f36c51..c826774698e 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -63,7 +63,7 @@ Test_DynUnion::run_test (void)
this->orb_->create_dyn_any (in_any1,
ACE_TRY_ENV);
ACE_TRY_CHECK;
- CORBA_DynUnion_var fa1 = CORBA_DynUnion::_narrow (dp1,
+ CORBA_DynUnion_var fa1 = CORBA_DynUnion::_narrow (dp1.in (),
ACE_TRY_ENV);
ACE_TRY_CHECK;
fa1->insert_typecode (data.m_typecode1,
@@ -133,7 +133,7 @@ Test_DynUnion::run_test (void)
ACE_TRY_CHECK;
CORBA::TypeCode_var tc = dp3->get_typecode (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (!ACE_OS::strcmp (m_nm, "tc")
+ if (!ACE_OS::strcmp (m_nm.in (), "tc")
&& tk == CORBA::tk_TypeCode
&& data.m_typecode1->equal (tc.in ()))
ACE_DEBUG ((LM_DEBUG,