ChangeLogTag: Wed Jul 26 20:56:41 2000 Jeff Parsons <parsons@cs.wustl.edu>

13 files changed, 310 insertions, 266 deletions

diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp
index 45dd8c1e749..4fb549e3879 100644
--- a/TAO/tao/DynAny_i.cpp
+++ b/TAO/tao/DynAny_i.cpp
@@ -76,8 +76,8 @@ TAO_DynAny_i::TAO_DynAny_i (const CORBA_Any& any)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      // @@ Is the typecode duplicate in Any.type()???
-      int tk = unalias (any.type (), ACE_TRY_ENV);
+      CORBA::TypeCode_var tc = any.type ();
+      int tk = unalias (tc.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
       switch (tk)
         {
@@ -122,18 +122,19 @@ TAO_DynAny_i::~TAO_DynAny_i (void)
 CORBA::TypeCode_ptr
 TAO_DynAny_i::type (CORBA::Environment &)
 {
-  return CORBA_TypeCode::_duplicate (this->value_.type ());
+  return this->value_.type ();
 }
 
 void
 TAO_DynAny_i::assign (CORBA_DynAny_ptr dyn_any,
                       CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TypeCode_ptr tp = dyn_any->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tp = dyn_any->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::Boolean equal = this->value_.type ()->equal (tp,
-                                                      ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::Boolean equal = tc->equal (tp.in (),
+                                    ACE_TRY_ENV);
   ACE_CHECK;
 
   if (equal)
@@ -150,12 +151,15 @@ TAO_DynAny_i::assign (CORBA_DynAny_ptr dyn_any,
 CORBA_DynAny_ptr
 TAO_DynAny_i::copy (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_DynAny_i* tmp = new TAO_DynAny_i (this->value_);
-
-  CORBA_DynAny_ptr retval = tmp->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_DynAny_i* tmp = 0;
+  ACE_NEW_RETURN (tmp,
+                  TAO_DynAny_i (this->value_),
+                  CORBA::DynAny::_nil ());
+                  
+  CORBA_DynAny_var retval = tmp->_this (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CORBA::DynAny::_nil ());
 
-  return retval;
+  return retval._retn ();
 }
 
 void
@@ -168,9 +172,11 @@ void
 TAO_DynAny_i::from_any (const CORBA_Any& any,
                         CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Boolean equal =
-    this->value_.type ()->equal (any.type (),
-                                 ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TypeCode_var any_tc = any.type ();
+
+  CORBA::Boolean equal = tc->equal (any_tc.in (),
+                                    ACE_TRY_ENV);
   ACE_CHECK;
 
   if (!equal || any._tao_get_cdr () == 0)
@@ -235,7 +241,8 @@ void
 TAO_DynAny_i::insert_boolean (CORBA::Boolean value,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -254,7 +261,8 @@ void
 TAO_DynAny_i::insert_octet (CORBA::Octet value,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -273,7 +281,8 @@ void
 TAO_DynAny_i::insert_char (CORBA::Char value,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -292,7 +301,8 @@ void
 TAO_DynAny_i::insert_short (CORBA::Short value,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -310,7 +320,8 @@ void
 TAO_DynAny_i::insert_ushort (CORBA::UShort value,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -328,7 +339,8 @@ void
 TAO_DynAny_i::insert_long (CORBA::Long value,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -346,7 +358,8 @@ void
 TAO_DynAny_i::insert_ulong (CORBA::ULong value,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -364,7 +377,8 @@ void
 TAO_DynAny_i::insert_float (CORBA::Float value,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -382,7 +396,8 @@ void
 TAO_DynAny_i::insert_double (CORBA::Double value,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -400,7 +415,8 @@ void
 TAO_DynAny_i::insert_string (const char * value,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -418,7 +434,8 @@ void
 TAO_DynAny_i::insert_reference (CORBA::Object_ptr value,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -429,7 +446,10 @@ TAO_DynAny_i::insert_reference (CORBA::Object_ptr value,
       TAO_OutputCDR stream;
       if (!(stream << obj.in ()))
           ACE_THROW (CORBA::MARSHAL ());
-      this->value_._tao_replace (this->value_.type (),
+
+      CORBA::TypeCode_var tc = this->value_.type ();
+
+      this->value_._tao_replace (tc.in (),
                                  TAO_ENCAP_BYTE_ORDER,
                                  stream.begin (),
                                  1,
@@ -446,7 +466,8 @@ void
 TAO_DynAny_i::insert_typecode (CORBA::TypeCode_ptr value,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -464,7 +485,8 @@ void
 TAO_DynAny_i::insert_longlong (CORBA::LongLong value,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -482,8 +504,9 @@ void
 TAO_DynAny_i::insert_ulonglong (CORBA::ULongLong value,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = unalias (this->value_.type (),
-                                ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
+                                              ACE_TRY_ENV);
   ACE_CHECK;
 
   if (kind == CORBA::tk_ulonglong)
@@ -500,7 +523,8 @@ void
 TAO_DynAny_i::insert_wchar (CORBA::WChar value,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -519,7 +543,8 @@ void
 TAO_DynAny_i::insert_any (const CORBA::Any& value,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
+  CORBA::TypeCode_var tc = this->value_.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -777,7 +802,8 @@ CORBA_DynAny_ptr
 TAO_DynAny_i::create_dyn_any (const CORBA_Any &any,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (any.type (),
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
 
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index c49061ad68b..11ff159b57e 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -43,7 +43,8 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
 
       if (kind == CORBA::tk_array)
         {
-          CORBA::ULong numfields = this->get_arg_length (any.type (),
+          CORBA::TypeCode_var tc = any.type ();
+          CORBA::ULong numfields = this->get_arg_length (tc.in (),
                                                          ACE_TRY_ENV);
           ACE_TRY_CHECK;
           // Resize the array.
@@ -183,11 +184,14 @@ TAO_DynArray_i::set_elements (const CORBA_AnySeq& value,
     this->get_element_type (ACE_TRY_ENV);
   ACE_CHECK;
 
+  CORBA::TypeCode_var value_tc;
+
   for (CORBA::ULong i = 0; i < length; i++)
     {
       // Check each arg element for type match.
-      CORBA::Boolean equal = value[i].type ()->equal (element_type.in (),
-                                                      ACE_TRY_ENV);
+      value_tc = value[i].type ();
+      CORBA::Boolean equal = value_tc->equal (element_type.in (),
+                                              ACE_TRY_ENV);
       ACE_CHECK;
 
       if (equal)
@@ -273,7 +277,8 @@ void
 TAO_DynArray_i::from_any (const CORBA_Any& any,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::Boolean equal = this->type_.in ()->equal (tc.in (),
                                                    ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -285,7 +290,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
                         any._tao_byte_order ());
 
       CORBA::ULong length = this->da_members_.size ();
-      CORBA::ULong arg_length = this->get_arg_length (any.type (),
+      CORBA::ULong arg_length = this->get_arg_length (tc.in (),
                                                       ACE_TRY_ENV);
       ACE_CHECK;
 
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index 60fbad19c2b..c8cacd8ab99 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -209,7 +209,8 @@ void
 TAO_DynEnum_i::from_any (const CORBA_Any& any,
                          CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (any.type (),
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 1fe5afe5dfc..fa392d2dd96 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -193,11 +193,14 @@ TAO_DynSequence_i::set_elements (const CORBA_AnySeq& value,
     this->get_element_type (ACE_TRY_ENV);
   ACE_CHECK;
 
+  CORBA::TypeCode_var value_tc;
+
   for (CORBA::ULong i = 0; i < length; i++)
     {
       // Check each arg element for type match.
-      CORBA::Boolean equal = value[i].type ()->equal (element_type.in (),
-                                                      ACE_TRY_ENV);
+      value_tc = value[i].type ();
+      CORBA::Boolean equal = value_tc->equal (element_type.in (),
+                                              ACE_TRY_ENV);
       ACE_CHECK;
 
       if (equal)
@@ -283,7 +286,8 @@ void
 TAO_DynSequence_i::from_any (const CORBA_Any& any,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::Boolean equal = this->type_.in ()->equal (tc.in (),
                                                    ACE_TRY_ENV);
   ACE_CHECK;
 
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index f9856f2d245..a3ee7c14dd6 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -200,6 +200,8 @@ TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
   // Check for length match.
   if (length == this->da_members_.size ())
     {
+      CORBA::TypeCode_var value_tc;
+
       for (CORBA::ULong i = 0; i < length; i++)
         {
           // Check for type and name match.
@@ -207,7 +209,9 @@ TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
                                                                   ACE_TRY_ENV);
           ACE_CHECK;
 
-          if (value[i].value.type ()->equal (tc.in ())
+          value_tc = value[i].value.type ();
+
+          if (value_tc->equal (tc.in ())
               && !ACE_OS::strcmp (value[i].id,
                                   this->type_.in ()->member_name (i)))
             {
@@ -298,7 +302,8 @@ void
 TAO_DynStruct_i::from_any (const CORBA_Any& any,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::Boolean equal = this->type_.in ()->equal (tc.in (),
                                                    ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -940,10 +945,10 @@ TAO_DynStruct_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -979,10 +984,10 @@ TAO_DynStruct_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1018,10 +1023,10 @@ TAO_DynStruct_i::get_char (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1057,10 +1062,10 @@ TAO_DynStruct_i::get_short (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1096,10 +1101,10 @@ TAO_DynStruct_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1135,10 +1140,10 @@ TAO_DynStruct_i::get_long (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1174,10 +1179,10 @@ TAO_DynStruct_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1213,10 +1218,10 @@ TAO_DynStruct_i::get_float (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1252,10 +1257,10 @@ TAO_DynStruct_i::get_double (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1291,10 +1296,10 @@ TAO_DynStruct_i::get_string (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1330,10 +1335,10 @@ TAO_DynStruct_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1369,10 +1374,10 @@ TAO_DynStruct_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1412,10 +1417,10 @@ TAO_DynStruct_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
+      ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (val);
 
@@ -1451,10 +1456,10 @@ TAO_DynStruct_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1490,10 +1495,10 @@ TAO_DynStruct_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1529,10 +1534,10 @@ TAO_DynStruct_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var tc = dp->type (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 6011b52c57d..8162ed151c5 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -43,7 +43,8 @@ TAO_DynUnion_i::TAO_DynUnion_i (const CORBA_Any& any)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int tk = TAO_DynAny_i::unalias (any.type (),
+      CORBA::TypeCode_var tc = any.type ();
+      int tk = TAO_DynAny_i::unalias (tc.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -139,7 +140,7 @@ TAO_DynUnion_i::set_as_default (CORBA::Boolean /* set_as_default */,
 CORBA_DynAny_ptr
 TAO_DynUnion_i::discriminator (CORBA::Environment &)
 {
-  return this->discriminator_.in ();
+  return CORBA::DynAny::_duplicate (this->discriminator_.in ());
 }
 
 CORBA::TCKind
@@ -158,7 +159,7 @@ TAO_DynUnion_i::discriminator_kind (CORBA::Environment& ACE_TRY_ENV)
 CORBA_DynAny_ptr
 TAO_DynUnion_i::member (CORBA::Environment &)
 {
-  return this->member_.in ();
+  return CORBA::DynAny::_duplicate (this->member_.in ());
 }
 
 char*
@@ -300,7 +301,8 @@ void
 TAO_DynUnion_i::from_any (const CORBA_Any& any,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
+  CORBA::TypeCode_var tc = any.type ();
+  CORBA::Boolean equal = this->type_.in ()->equal (tc.in (),
                                                    ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -502,10 +504,10 @@ void
 TAO_DynUnion_i::insert_boolean (CORBA::Boolean value,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -632,10 +634,10 @@ void
 TAO_DynUnion_i::insert_char (CORBA::Char value,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -697,10 +699,10 @@ void
 TAO_DynUnion_i::insert_short (CORBA::Short value,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -762,10 +764,10 @@ void
 TAO_DynUnion_i::insert_long (CORBA::Long value,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -827,10 +829,10 @@ void
 TAO_DynUnion_i::insert_ushort (CORBA::UShort value,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -892,10 +894,10 @@ void
 TAO_DynUnion_i::insert_ulong (CORBA::ULong value,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -957,10 +959,10 @@ void
 TAO_DynUnion_i::insert_float (CORBA::Float value,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1022,10 +1024,10 @@ void
 TAO_DynUnion_i::insert_double (CORBA::Double value,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1087,10 +1089,10 @@ void
 TAO_DynUnion_i::insert_string (const char* value,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1152,10 +1154,10 @@ void
 TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1217,10 +1219,10 @@ void
 TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1282,10 +1284,10 @@ void
 TAO_DynUnion_i::insert_longlong (CORBA::LongLong value,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1347,10 +1349,10 @@ void
 TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1412,10 +1414,10 @@ void
 TAO_DynUnion_i::insert_wchar (CORBA::WChar value,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1477,10 +1479,10 @@ void
 TAO_DynUnion_i::insert_any (const CORBA::Any& value,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var type = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (type.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -1545,10 +1547,10 @@ TAO_DynUnion_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Boolean retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1571,10 +1573,10 @@ TAO_DynUnion_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Octet retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1597,10 +1599,10 @@ TAO_DynUnion_i::get_char (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Char retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1623,10 +1625,10 @@ TAO_DynUnion_i::get_short (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Short retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1649,10 +1651,10 @@ TAO_DynUnion_i::get_long (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Long retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1675,10 +1677,10 @@ TAO_DynUnion_i::get_ushort(CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::UShort retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1701,10 +1703,10 @@ TAO_DynUnion_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::ULong retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1727,10 +1729,10 @@ TAO_DynUnion_i::get_float (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Float retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1753,10 +1755,10 @@ TAO_DynUnion_i::get_double (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Double retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1779,10 +1781,10 @@ TAO_DynUnion_i::get_string (CORBA::Environment &ACE_TRY_ENV)
 {
   char * retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1805,10 +1807,10 @@ TAO_DynUnion_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::TypeCode_ptr retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1831,10 +1833,10 @@ TAO_DynUnion_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Object_ptr retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1861,10 +1863,10 @@ TAO_DynUnion_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
   CORBA::LongLong retval = 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1887,10 +1889,10 @@ TAO_DynUnion_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::ULongLong retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1913,10 +1915,10 @@ TAO_DynUnion_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::WChar retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -1939,10 +1941,10 @@ TAO_DynUnion_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Any_ptr retval = 0;
 
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
+  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc.in (),
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
@@ -2119,11 +2121,12 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
   TAO_InputCDR cdr (mb,
                     any._tao_byte_order ());
 
-  CORBA_TypeCode_ptr disc_tc =
-    any.type ()->discriminator_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = any.type ();
+
+  CORBA_TypeCode_var disc_tc = tc->discriminator_type (ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA_Any disc_any (disc_tc,
+  CORBA_Any disc_any (disc_tc.in (),
                       0,
                       cdr.byte_order (),
                       cdr.start ());
@@ -2145,7 +2148,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
                                            ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA::ULong count = any.type ()->member_count (ACE_TRY_ENV);
+  CORBA::ULong count = tc->member_count (ACE_TRY_ENV);
   ACE_CHECK;
 
   CORBA::ULong i;
@@ -2159,14 +2162,18 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
                          ACE_TRY_ENV);
   ACE_CHECK;
 
+  CORBA::TypeCode_var label_tc;
+
   // Get the index.
   for (i = 0; i < count; i++)
     {
-      CORBA_Any label_any = *any.type ()->member_label (i,
-                                                        ACE_TRY_ENV);
+      CORBA_Any label_any = *tc->member_label (i,
+                                               ACE_TRY_ENV);
       ACE_CHECK;
 
-      CORBA::TCKind label_kind = label_any.type ()->kind (ACE_TRY_ENV);
+      label_tc = label_any.type ();
+
+      CORBA::TCKind label_kind = label_tc->kind (ACE_TRY_ENV);
       ACE_CHECK;
 
       // If there is a default index, note the value but don't call
@@ -2199,8 +2206,8 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
         }
 
       CORBA::TypeCode_var member_tc =
-        any.type ()->member_type (this->current_index_,
-                                  ACE_TRY_ENV);
+        tc->member_type (this->current_index_,
+                         ACE_TRY_ENV);
       ACE_CHECK;
 
       CORBA_Any member_any (member_tc.in (),
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index aa7cac1fdd1..496626945a2 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -49,8 +49,7 @@ int main (int argc, char* argv[])
 
 // constructor
 Driver::Driver (void)
-  : orb_ (0),
-    test_type_ (NO_TEST)
+  : test_type_ (NO_TEST)
 {
 }
 
@@ -197,6 +196,33 @@ Driver::run (void)
         break;
     }
 
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::Object_var obj =
+        this->orb_->resolve_initial_references ("RootPOA",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (obj.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      root_poa->destroy (1,
+                         1,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Driver::run");
+
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   return retstatus;
 }
 
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 408e5e57bff..a84b9446d2e 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -54,7 +54,7 @@ Test_DynAny::run_test (void)
                  "testing: constructor(Any)/insert/get\n"));
 
       CORBA_Any in1 (CORBA::_tc_double);
-      CORBA_DynAny_ptr fa1 = this->orb_->create_dyn_any (in1,
+      CORBA_DynAny_var fa1 = this->orb_->create_dyn_any (in1,
                                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->insert_double (data.m_double1, 
@@ -72,7 +72,7 @@ Test_DynAny::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       d_out = data.m_double2;
-      CORBA_DynAny_ptr ftc1 = 
+      CORBA_DynAny_var ftc1 = 
         this->orb_->create_basic_dyn_any (CORBA::_tc_double,
                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -81,12 +81,9 @@ Test_DynAny::run_test (void)
       ftc1->from_any (in_any1, 
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      *out_any1 >>= d_out;
-
-      // value in DynAny_i created with NEW
-      delete out_any1;
+      out_any1 >>= d_out;
 
       if (d_out == data.m_double1)
         ACE_DEBUG ((LM_DEBUG,
@@ -96,10 +93,8 @@ Test_DynAny::run_test (void)
 
       fa1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (fa1);
       ftc1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (ftc1);
 
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -109,14 +104,14 @@ Test_DynAny::run_test (void)
                  "testing: constructor(Any)/insert/get\n"));
 
       CORBA_Any in (CORBA::_tc_TypeCode);
-      CORBA_DynAny_ptr fa2 = 
+      CORBA_DynAny_var fa2 = 
         this->orb_->create_dyn_any (in,
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa2->insert_typecode (data.m_typecode1, 
                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_ptr tc_out = fa2->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (tc_out->equal (data.m_typecode1,
                          ACE_TRY_ENV))
@@ -130,8 +125,7 @@ Test_DynAny::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      tc_out = data.m_typecode2;
-      CORBA_DynAny_ptr ftc2 = 
+      CORBA_DynAny_var ftc2 = 
         this->orb_->create_basic_dyn_any (CORBA::_tc_TypeCode,
                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -140,14 +134,12 @@ Test_DynAny::run_test (void)
       ftc2->from_any (in_any2, 
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::Any* out_any2 = ftc2->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any2 = ftc2->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      *out_any2 >>= tc_out;
-
-      // value in DynAny_i created with NEW
-      delete out_any2;
+      CORBA::TypeCode_ptr out_tc;
+      out_any2 >>= out_tc;
 
-      if (tc_out->equal(data.m_typecode1,
+      if (out_tc->equal(data.m_typecode1,
                         ACE_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -158,11 +150,8 @@ Test_DynAny::run_test (void)
 
       fa2->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (fa2);
       ftc2->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (ftc2);
-      CORBA::release (tc_out);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 0c0ed4ccc6e..f6b2263a9f4 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -57,10 +57,10 @@ Test_DynArray::run_test (void)
 
       CORBA::Any in_any1;
       in_any1 <<= ta;
-      CORBA_DynAny_ptr dp1 = this->orb_->create_dyn_any (in_any1,
+      CORBA_DynAny_var dp1 = this->orb_->create_dyn_any (in_any1,
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynArray_ptr fa1 = CORBA_DynArray::_narrow (dp1,
+      CORBA_DynArray_var fa1 = CORBA_DynArray::_narrow (dp1,
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->seek (1,
@@ -86,7 +86,7 @@ Test_DynArray::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynArray_ptr ftc1 = 
+      CORBA_DynArray_var ftc1 = 
         this->orb_->create_dyn_array (DynAnyTests::_tc_test_array,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -96,10 +96,10 @@ Test_DynArray::run_test (void)
       ftc1->from_any (in_any2,
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       DynAnyTests::test_array_forany ta_out;
-      *out_any1 >>= ta_out; 
+      out_any1.in () >>= ta_out; 
       
       if (ta_out[(CORBA::ULong) 1] == data.m_long1)
         ACE_DEBUG ((LM_DEBUG,
@@ -107,9 +107,6 @@ Test_DynArray::run_test (void)
       else 
         ++this->error_count_;
 
-      // Created with NEW
-      delete out_any1;
-
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_elements/get_elements\n"));
 
@@ -138,11 +135,8 @@ Test_DynArray::run_test (void)
 
       fa1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (fa1);
       ftc1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (ftc1);
-      CORBA::release (dp1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 7dfea04b81b..d4f7c247516 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -51,10 +51,10 @@ Test_DynEnum::run_test (void)
 
       CORBA_Any in_any1;
       in_any1 <<= te;
-      CORBA_DynAny_ptr dp1 = this->orb_->create_dyn_any (in_any1,
+      CORBA_DynAny_var dp1 = this->orb_->create_dyn_any (in_any1,
                                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynEnum_ptr de1 = CORBA_DynEnum::_narrow (dp1,
+      CORBA_DynEnum_var de1 = CORBA_DynEnum::_narrow (dp1,
                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       de1->value_as_ulong (2,
@@ -86,7 +86,7 @@ Test_DynEnum::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynEnum_ptr de2 = 
+      CORBA_DynEnum_var de2 = 
         this->orb_->create_dyn_enum (DynAnyTests::_tc_test_enum,
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -95,25 +95,19 @@ Test_DynEnum::run_test (void)
       de2->from_any (in_any2,
                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_Any* out_any1 = de2->to_any (ACE_TRY_ENV);
+      CORBA_Any_var out_any1 = de2->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      *out_any1 >>= te;
+      out_any1.in () >>= te;
       if (te == DynAnyTests::TE_THIRD)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_;
 
-      // Created with NEW
-      delete out_any1;
-
       de1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (de1);
       de2->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (de2);
-      CORBA::release (dp1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 8fca902e6de..f67fe0021fc 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -60,11 +60,11 @@ Test_DynSequence::run_test (void)
       ts[1] = data.m_string2;
       CORBA_Any in_any1;
       in_any1 <<= ts;
-      CORBA_DynAny_ptr dp1 =
+      CORBA_DynAny_var dp1 =
         this->orb_->create_dyn_any (in_any1,
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynSequence_ptr fa1 = CORBA_DynSequence::_narrow (dp1,
+      CORBA_DynSequence_var fa1 = CORBA_DynSequence::_narrow (dp1,
                                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->seek (1,
@@ -78,9 +78,9 @@ Test_DynSequence::run_test (void)
       fa1->seek (1,
                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      char* out_str1 = fa1->get_string (ACE_TRY_ENV);
+      CORBA::String_var out_str1 = fa1->get_string (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (!ACE_OS::strcmp (out_str1, data.m_string1))
+      if (!ACE_OS::strcmp (out_str1.in (), data.m_string1))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else
@@ -89,7 +89,7 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynSequence_ptr ftc1 =
+      CORBA_DynSequence_var ftc1 =
         this->orb_->create_dyn_sequence (DynAnyTests::_tc_test_seq,
                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -134,9 +134,10 @@ Test_DynSequence::run_test (void)
       ftc1->set_elements (as_in,
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::AnySeq* as_out = ftc1->get_elements (ACE_TRY_ENV);
+      CORBA::AnySeq_var as_out = ftc1->get_elements (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_Any out_any2 = (*as_out)[2];
+      CORBA::ULong index = 2;
+      CORBA_Any out_any2 = as_out[index];
       char* out_str2;
       out_any2 >>= CORBA::Any::to_string (out_str2, 0);
       if (ACE_OS::strcmp (out_str2, data.m_string1))
@@ -145,17 +146,10 @@ Test_DynSequence::run_test (void)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
 
-      // Created with NEW
-      delete as_out;
-      delete out_str2;
-
       fa1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (fa1);
-      CORBA::release (dp1);
       ftc1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (ftc1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1d9e3dd7953..0f07fbfbb42 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -57,27 +57,37 @@ Test_DynStruct::run_test (void)
 
       CORBA_Any in_any1;
       in_any1 <<= ts;
-      CORBA_DynAny_ptr dp1 = 
+      CORBA_DynAny_var dp1 = 
         this->orb_->create_dyn_any (in_any1,
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynStruct_ptr fa1 = CORBA_DynStruct::_narrow (dp1,
+      CORBA_DynStruct_var fa1 = CORBA_DynStruct::_narrow (dp1,
                                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->insert_char (data.m_char1,
                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->insert_long (data.m_long1,
-        ACE_TRY_ENV);
+                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      fa1->current_component (ACE_TRY_ENV)->insert_float (data.m_float1,
-                                                          ACE_TRY_ENV);
+
+      CORBA::DynAny_var cc = fa1->current_component (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      fa1->current_component (ACE_TRY_ENV)->insert_short (data.m_short1,
-                                                          ACE_TRY_ENV);
+      cc->insert_float (data.m_float1,
+                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      fa1->current_component (ACE_TRY_ENV)->rewind (ACE_TRY_ENV);
+
+      cc = fa1->current_component (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      cc->insert_short (data.m_short1,
+                        ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      cc = fa1->current_component (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+      cc->rewind (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       fa1->rewind (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::Char c = fa1->get_char (ACE_TRY_ENV);
@@ -88,12 +98,18 @@ Test_DynStruct::run_test (void)
       ACE_TRY_CHECK;
       if (l != data.m_long1)
         ++this->error_count_;
-      fa1->current_component(ACE_TRY_ENV)->seek (1,
-                                                ACE_TRY_ENV);
+
+      cc = fa1->current_component (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::Short s = 
-        fa1->current_component (ACE_TRY_ENV)->get_short (ACE_TRY_ENV);
+      cc->seek (1,
+                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      cc = fa1->current_component (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+      CORBA::Short s = cc->get_short (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (s != data.m_short1)
         ++this->error_count_;
       if (this->error_count_ == 0)
@@ -103,7 +119,7 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynStruct_ptr ftc1 = 
+      CORBA_DynStruct_var ftc1 = 
         this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -116,28 +132,25 @@ Test_DynStruct::run_test (void)
       ftc1->from_any (in_any2,
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA_Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       DynAnyTests::test_struct* ts_out;
-      *out_any1 >>= ts_out;
+      out_any1.in () >>= ts_out;
       if (ts_out->es.s == data.m_short1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_;
 
-      // Created with NEW
-      delete out_any1;
-
       ACE_DEBUG ((LM_DEBUG,
                  "testing: current_member_name/current_member_kind\n"));
 
       ftc1->seek (2,
                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::FieldName fn = ftc1->current_member_name (ACE_TRY_ENV);
+      CORBA::FieldName_var fn = ftc1->current_member_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (ACE_OS::strcmp (fn, "es"))
+      if (ACE_OS::strcmp (fn.in (), "es"))
         ++this->error_count_;
       CORBA::TCKind tk = ftc1->current_member_kind (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -150,33 +163,26 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: get_members/set_members\n"));
 
-      CORBA::NameValuePairSeq* nvps = fa1->get_members (ACE_TRY_ENV);
-      CORBA_DynStruct_ptr sm =
+      CORBA::NameValuePairSeq_var nvps = fa1->get_members (ACE_TRY_ENV);
+      CORBA_DynStruct_var sm =
         this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      sm->set_members (*nvps,
+      sm->set_members (nvps.in (),
                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::NameValuePairSeq* gm = sm->get_members (ACE_TRY_ENV);
+      CORBA::NameValuePairSeq_var gm = sm->get_members (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (ACE_OS::strcmp ((*gm)[2].id, "es"))
+      CORBA::ULong index = 2;
+      if (ACE_OS::strcmp (gm[index].id, "es"))
         ++this->error_count_;
 
-      // Created with NEW
-      delete nvps;
-      delete gm;
-
       fa1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (fa1);
-      CORBA::release (dp1);
       ftc1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (ftc1);
       sm->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (sm);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 3524e57973f..08b26f36c51 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -59,19 +59,19 @@ Test_DynUnion::run_test (void)
       tu.tc (data.m_typecode2);
       CORBA_Any in_any1;
       in_any1 <<= tu;
-      CORBA_DynAny_ptr dp1 =
+      CORBA_DynAny_var dp1 =
         this->orb_->create_dyn_any (in_any1,
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynUnion_ptr fa1 = CORBA_DynUnion::_narrow (dp1,
+      CORBA_DynUnion_var fa1 = CORBA_DynUnion::_narrow (dp1,
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->insert_typecode (data.m_typecode1,
                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_ptr s_out1 = fa1->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (s_out1->equal (data.m_typecode1))
+      if (s_out1.in ()->equal (data.m_typecode1))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else
@@ -80,26 +80,23 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_Any* out_any1 = fa1->to_any (ACE_TRY_ENV);
+      CORBA_Any_var out_any1 = fa1->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynUnion_ptr ftc1 =
+      CORBA_DynUnion_var ftc1 =
         this->orb_->create_dyn_union (DynAnyTests::_tc_test_union,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       ftc1->from_any (*out_any1,
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_ptr s_out2 = ftc1->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (s_out2->equal (data.m_typecode1))
+      if (s_out2.in ()->equal (data.m_typecode1))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else
         ++this->error_count_;
 
-      // Created with NEW
-      delete out_any1;
-
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_as_default\n"));
 
@@ -114,7 +111,7 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:discriminator/discriminator_kind\n"));
 
-      CORBA_DynAny_ptr dp2 = ftc1->discriminator (ACE_TRY_ENV);
+      CORBA_DynAny_var dp2 = ftc1->discriminator (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (dp2->type (ACE_TRY_ENV)->kind ()
             == ftc1->discriminator_kind (ACE_TRY_ENV))
@@ -128,15 +125,17 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:member/member_kind/member_name\n"));
 
-      CORBA_DynAny_ptr dp3 = ftc1->member (ACE_TRY_ENV);
+      CORBA_DynAny_var dp3 = ftc1->member (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      char * m_nm = ftc1->member_name (ACE_TRY_ENV);
+      CORBA::String_var m_nm = ftc1->member_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::TCKind tk = ftc1->member_kind (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+      CORBA::TypeCode_var tc = dp3->get_typecode (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
       if (!ACE_OS::strcmp (m_nm, "tc")
           && tk == CORBA::tk_TypeCode
-          && data.m_typecode1->equal (dp3->get_typecode (ACE_TRY_ENV)))
+          && data.m_typecode1->equal (tc.in ()))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else
@@ -144,16 +143,10 @@ Test_DynUnion::run_test (void)
 
       ACE_TRY_CHECK;
 
-      // Created with string_dup
-      CORBA::string_free (m_nm);
-
       fa1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (fa1);
-      CORBA::release (dp1);
       ftc1->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::release (ftc1);
     }
   ACE_CATCHANY
     {