ChangeLogTag: Wed Mar 12 09:49:00 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

16 files changed, 3213 insertions, 2298 deletions

diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index b6c261b2322..99bc85390cb 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 // =================================================================
 //
 // = LIBRARY
@@ -23,12 +24,10 @@
 
 #include "ace/Auto_Ptr.h"
 
-
 ACE_RCSID (DynamicAny,
            DynAnyFactory,
            "$Id$")
 
-
 // Constructor from typecode
 TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 {
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index ffbad848f3d..338d8636e61 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,7 +1,9 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynAny_i.h"
 #include "DynAnyFactory.h"
 
-
 ACE_RCSID (DynamicAny,
            DynAny_i,
            "$Id$")
@@ -60,7 +62,8 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
     case CORBA::tk_null:
       break;
     case CORBA::tk_void:
-      this->any_ = CORBA::Any (CORBA::_tc_void);
+      this->any_ = CORBA::Any (CORBA::_tc_void,
+                               0);
       break;
     case CORBA::tk_short:
       this->any_ <<= ACE_static_cast (CORBA::Short, 0);
@@ -101,7 +104,8 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
       this->any_ <<= ACE_static_cast (CORBA::Double, 0);
       break;
     case CORBA::tk_any:
-      this->any_ <<= CORBA::Any (CORBA::_tc_null);
+      this->any_ <<= CORBA::Any (CORBA::_tc_null,
+                                 0);
       break;
     case CORBA::tk_TypeCode:
       {
@@ -114,9 +118,12 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
       {
         TAO_OutputCDR stream;
         stream << CORBA::Object::_nil ();
-        this->any_._tao_replace (tc,
-                                 TAO_ENCAP_BYTE_ORDER,
-                                 stream.begin ());
+        TAO::Unknown_IDL_Type *unk = 0;
+        ACE_NEW (unk,
+                 TAO::Unknown_IDL_Type (tc,
+                                        stream.begin (),
+                                        TAO_ENCAP_BYTE_ORDER));
+        this->any_.replace (unk);
         break;
       }
     case CORBA::tk_string:
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index c304536d27d..5039f8d689a 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "DynCommon.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 
 #if defined (_MSC_VER)
 # if (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index f69fc0d5cf1..67c14e6b3a0 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynArray_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynArray_i,
            "$Id$")
@@ -62,13 +64,15 @@ TAO_DynArray_i::init (const CORBA::Any & any
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  for (CORBA::ULong i = 0; i < numfields; i++)
+  for (CORBA::ULong i = 0; i < numfields; ++i)
     {
-      // This Any constructor is a TAO extension.
-      CORBA::Any field_any (field_tc.in (),
-                            0,
-                            cdr.byte_order (),
-                            cdr.start ());
+      CORBA::Any field_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (field_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      field_any.replace (unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -429,11 +433,13 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
-          // This Any constructor is a TAO extension.
-          CORBA::Any field_any (field_tc.in (),
-                               0,
-                               cdr.byte_order (),
-                               cdr.start ());
+          CORBA::Any field_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (field_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          field_any.replace (unk);
 
           this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
@@ -499,13 +505,19 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                                0,
-                                in_cdr.byte_order (),
-                                in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index cf7f985a802..b8cc444b224 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,3 +1,6 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynCommon.h"
 #include "DynAnyFactory.h"
 #include "DynAny_i.h"
@@ -7,7 +10,6 @@
 #include "DynStruct_i.h"
 #include "DynUnion_i.h"
 
-
 ACE_RCSID (DynamicAny,
            DynCommon,
            "$Id$")
@@ -478,10 +480,13 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
       if (good_type)
         {
           TAO_OutputCDR cdr;
-          cdr << value;
-          this->any_._tao_replace (this->type_.in (),
-                                   TAO_ENCAP_BYTE_ORDER,
-                                   cdr.begin ());
+          value->marshal (cdr);
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (this->type_.in (),
+                                          cdr.begin (),
+                                          TAO_ENCAP_BYTE_ORDER));
+          this->any_.replace (unk);
         }
       else
         {
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index f2f64e38f0d..a39234191fe 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,7 +1,9 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynEnum_i.h"
 #include "DynAnyFactory.h"
 
-
 ACE_RCSID (DynamicAny,
            DynEnum_i,
            "$Id$")
@@ -238,12 +240,19 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any *retval;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                               0,
-                               TAO_ENCAP_BYTE_ORDER,
-                               out_cdr.begin ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           out_cdr.begin (),
+                                           TAO_ENCAP_BYTE_ORDER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
+
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 79f5aab7fcb..e8990ae1075 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynSequence_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynSequence_i,
            "$Id$")
@@ -69,11 +71,13 @@ TAO_DynSequence_i::init (const CORBA::Any& any
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      // This Any constructor is a TAO extension.
-      CORBA::Any field_any (field_tc.in (),
-                            0,
-                            cdr.byte_order (),
-                            cdr.start ());
+      CORBA::Any field_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (field_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      field_any.replace (unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -585,11 +589,13 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
-          // This Any constructor is a TAO extension.
-          CORBA::Any field_any (field_tc.in (),
-                                0,
-                                cdr.byte_order (),
-                                cdr.start ());
+          CORBA::Any field_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (field_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          field_any.replace (unk);
 
           if (i < this->component_count_)
             {
@@ -676,13 +682,19 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                                0,
-                                in_cdr.byte_order (),
-                                in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 3288c2a896c..911406c00c2 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynStruct_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynStruct_i,
            "$Id$")
@@ -104,11 +106,13 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      // This Any constructor is a TAO extension.
-      CORBA::Any field_any (field_tc.in (),
-                           0,
-                           cdr.byte_order (),
-                           cdr.start ());
+      CORBA::Any field_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (field_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      field_any.replace (unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -537,7 +541,54 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
 
   if (equivalent)
     {
-       this->set_from_any (any ACE_ENV_ARG_PARAMETER);
+      // Get the CDR stream of the argument.
+      ACE_Message_Block* mb = any._tao_get_cdr ();
+      TAO_InputCDR cdr (mb,
+                        any._tao_byte_order ());
+
+      // If we have an exception type, unmarshal the repository ID.
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
+                                                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (kind == CORBA::tk_except)
+        {
+          CORBA::String_var str;
+          cdr >> str.out ();
+        }
+
+      CORBA::TypeCode_var field_tc;
+
+      for (CORBA::ULong i = 0; i < this->component_count_; ++i)
+        {
+          field_tc = this->type_.in ()->member_type (i
+                                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          CORBA::Any field_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (field_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          field_any.replace (unk);
+
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+
+          this->da_members_[i] =
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          // Move to the next field in the CDR stream.
+          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
+                                                   &cdr
+                                                   ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      this->current_position_ = this->component_count_ ? 0 : -1;
     }
   else
     {
@@ -594,13 +645,19 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                                0,
-                                in_cdr.byte_order (),
-                                in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 720d5c37e0b..0a257feb3a6 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynUnion_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynUnion_i,
            "$Id$")
@@ -48,18 +50,11 @@ TAO_DynUnion_i::init (const CORBA::Any& any
 
   this->init_common ();
 
-  // Map TypeMismatch to InconsistentTypeCode.2
-  ACE_TRY
-  {
-     this->set_from_any (any
-                         ACE_ENV_ARG_PARAMETER);
-     ACE_CHECK;
-  }
-  ACE_CATCH(DynamicAny::DynAny::TypeMismatch, ex)
-  {
-     ACE_TRY_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-  }
-  ACE_ENDTRY;
+  // Set the from_factory arg to TRUE, so any problems will throw
+  // InconsistentTypeCode.
+  this->set_from_any (any,
+                      1
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -146,7 +141,8 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
 // This code is common to from_any() and the init() overload that takes
 // an Any argument.
 void
-TAO_DynUnion_i::set_from_any (const CORBA::Any & any
+TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
+                              CORBA::Boolean from_factory
                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -162,13 +158,17 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
 
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA::TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc = 
+    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Any disc_any (disc_tc.in (),
-                      0,
-                      cdr.byte_order (),
-                      cdr.start ());
+  CORBA::Any disc_any;
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW (unk,
+           TAO::Unknown_IDL_Type (disc_tc.in (),
+                                  cdr.start (),
+                                  cdr.byte_order ()));
+  disc_any.replace (unk);
 
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->discriminator_.in ()))
@@ -225,10 +225,13 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Any member_any (member_tc.in (),
-                            0,
-                            cdr.byte_order (),
-                            cdr.start ());
+      CORBA::Any member_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (member_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      member_any.replace (unk);
 
       this->member_ =
         TAO_DynAnyFactory::make_dyn_any (member_any
@@ -264,10 +267,13 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
                                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA::Any default_any (default_tc.in (),
-                                 0,
-                                 cdr.byte_order (),
-                                 cdr.start ());
+          CORBA::Any default_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (default_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          default_any.replace (unk);
 
           this->member_ =
             TAO_DynAnyFactory::make_dyn_any (default_any
@@ -707,7 +713,10 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
       // May be changed in set_from_any().
       this->component_count_ = 2;
 
-      this->set_from_any (any
+      // Set the from_factory arg to FALSE, so any problems will throw
+      // TypeMismatch.
+      this->set_from_any (any,
+                          0
                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
@@ -774,13 +783,19 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                               0,
-                               in_cdr.byte_order (),
-                               in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 9ef3d4b215c..c5038b1bf9a 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -180,7 +180,8 @@ public:
 private:
   // Code common to the constructor from an Any arg and the member
   // function from_any().
-  void set_from_any (const CORBA::Any &any
+  void set_from_any (const CORBA::Any &any,
+                     CORBA::Boolean from_factory
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 8c5273acae2..09dc9b8e59c 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code from this file is:
  *
  * tao_idl \
- *  -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 \
+ *  -o orig -Gp -Gd -Ge 1 \
  *          -Wb,export_macro=TAO_DynamicAny_Export \
  *          -Wb,export_include=dynamicany_export.h \
  *          -Wb,pre_include="ace/pre.h" \
@@ -214,6 +214,4 @@ module DynamicAny {
 
 }; // module DynamicAny
 
-#pragma prefix ""
-
 #endif // _DYNAMIC_ANY_IDL_
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 29c23419094..0eba50e1727 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DynamicAny.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "DynamicAny.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,6 +44,9 @@
 #include "DynamicAnyC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynAny::_tao_class_id = 0;
 
 DynamicAny::DynAny_ptr
@@ -84,13 +92,23 @@ tao_DynamicAny_DynAny_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynAny_marshal (
+    DynamicAny::DynAny_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynAny_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynAny_var::DynAny_var (void) // default constructor
+DynamicAny::DynAny_var::DynAny_var (void)
   : ptr_ (DynAny::_nil ())
 {}
 
@@ -100,12 +118,12 @@ DynamicAny::DynAny_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p) // copy constructor
+DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p)
   : TAO_Base_var (),
     ptr_ (DynAny::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynAny_var::~DynAny_var (void) // destructor
+DynamicAny::DynAny_var::~DynAny_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -134,7 +152,7 @@ DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cas
   return this->ptr_;
 }
 
-DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast
+DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -209,10 +227,11 @@ DynamicAny::DynAny_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynAny_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
@@ -221,14 +240,14 @@ DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
   this->ptr_ = ::DynamicAny::DynAny::_nil ();
 }
 
-DynamicAny::DynAny_out::DynAny_out (DynAny_var &p) // constructor from _var
+DynamicAny::DynAny_out::DynAny_out (DynAny_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynAny::_nil ();
 }
 
-DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p) // copy constructor
+DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p)
   : ptr_ (ACE_const_cast (DynAny_out &, p).ptr_)
 {}
 
@@ -259,7 +278,7 @@ DynamicAny::DynAny_out::operator ::DynamicAny::DynAny_ptr &() // cast
 }
 
 ::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_out::ptr (void) // ptr
+DynamicAny::DynAny_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -270,9 +289,8 @@ DynamicAny::DynAny_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynAny::DynAny (void)
 {}
@@ -280,7 +298,8 @@ DynamicAny::DynAny::DynAny (void)
 DynamicAny::DynAny::~DynAny (void)
 {}
 
-DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow (
+DynamicAny::DynAny_ptr
+DynamicAny::DynAny::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -288,50 +307,68 @@ DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow (
   return DynAny::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynAny_ptr
+DynamicAny::DynAny_ptr 
 DynamicAny::DynAny::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynAny::_nil ();
+    {
+      return DynAny::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynAny_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynAny::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynAny::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynAny_ptr
 DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -340,7 +377,9 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynAny:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
   : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
@@ -349,12 +388,10 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
 {
 }
 
-// Copy constructor.
 DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -363,7 +400,6 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::Inva
 {
 }
 
-// Assignment operator.
 DynamicAny::DynAny::InvalidValue&
 DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
 {
@@ -372,11 +408,11 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid
 }
 
 DynamicAny::DynAny::InvalidValue *
-DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *exc)
+DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidValue *, exc);
+      return ACE_dynamic_cast (InvalidValue *, _tao_excp);
     }
   else
     {
@@ -397,13 +433,13 @@ DynamicAny::DynAny::InvalidValue::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      DynamicAny::DynAny::InvalidValue (*this),
+      ::DynamicAny::DynAny::InvalidValue (*this),
       0
     );
   return result;
 }
 
-void DynamicAny::DynAny::InvalidValue::_raise ()
+void DynamicAny::DynAny::InvalidValue::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -424,7 +460,11 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
   : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
@@ -433,12 +473,10 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
 {
 }
 
-// Copy constructor.
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -447,7 +485,6 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::Type
 {
 }
 
-// Assignment operator.
 DynamicAny::DynAny::TypeMismatch&
 DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
 {
@@ -456,11 +493,11 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis
 }
 
 DynamicAny::DynAny::TypeMismatch *
-DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *exc)
+DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (TypeMismatch *, exc);
+      return ACE_dynamic_cast (TypeMismatch *, _tao_excp);
     }
   else
     {
@@ -481,13 +518,13 @@ DynamicAny::DynAny::TypeMismatch::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      DynamicAny::DynAny::TypeMismatch (*this),
+      ::DynamicAny::DynAny::TypeMismatch (*this),
       0
     );
   return result;
 }
 
-void DynamicAny::DynAny::TypeMismatch::_raise ()
+void DynamicAny::DynAny::TypeMismatch::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -508,6 +545,11 @@ void DynamicAny::DynAny::TypeMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynFixed::_tao_class_id = 0;
 
 DynamicAny::DynFixed_ptr
@@ -553,13 +595,23 @@ tao_DynamicAny_DynFixed_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynFixed_marshal (
+    DynamicAny::DynFixed_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynFixed_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynFixed_var::DynFixed_var (void) // default constructor
+DynamicAny::DynFixed_var::DynFixed_var (void)
   : ptr_ (DynFixed::_nil ())
 {}
 
@@ -569,12 +621,12 @@ DynamicAny::DynFixed_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p) // copy constructor
+DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p)
   : TAO_Base_var (),
     ptr_ (DynFixed::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynFixed_var::~DynFixed_var (void) // destructor
+DynamicAny::DynFixed_var::~DynFixed_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -603,7 +655,7 @@ DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast
+DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -678,10 +730,11 @@ DynamicAny::DynFixed_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynFixed_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
@@ -690,14 +743,14 @@ DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
   this->ptr_ = ::DynamicAny::DynFixed::_nil ();
 }
 
-DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p) // constructor from _var
+DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynFixed::_nil ();
 }
 
-DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p) // copy constructor
+DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p)
   : ptr_ (ACE_const_cast (DynFixed_out &, p).ptr_)
 {}
 
@@ -728,7 +781,7 @@ DynamicAny::DynFixed_out::operator ::DynamicAny::DynFixed_ptr &() // cast
 }
 
 ::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_out::ptr (void) // ptr
+DynamicAny::DynFixed_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -739,9 +792,8 @@ DynamicAny::DynFixed_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynFixed::DynFixed (void)
 {}
@@ -749,7 +801,8 @@ DynamicAny::DynFixed::DynFixed (void)
 DynamicAny::DynFixed::~DynFixed (void)
 {}
 
-DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow (
+DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -757,62 +810,82 @@ DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow (
   return DynFixed::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_ptr 
 DynamicAny::DynFixed::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynFixed::_nil ();
+    {
+      return DynFixed::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynFixed_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynFixed::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynFixed::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynFixed)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynFixed)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -821,6 +894,9 @@ const char* DynamicAny::DynFixed::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynFixed:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynEnum::_tao_class_id = 0;
 
 DynamicAny::DynEnum_ptr
@@ -866,13 +942,23 @@ tao_DynamicAny_DynEnum_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynEnum_marshal (
+    DynamicAny::DynEnum_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynEnum_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynEnum_var::DynEnum_var (void) // default constructor
+DynamicAny::DynEnum_var::DynEnum_var (void)
   : ptr_ (DynEnum::_nil ())
 {}
 
@@ -882,12 +968,12 @@ DynamicAny::DynEnum_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p) // copy constructor
+DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p)
   : TAO_Base_var (),
     ptr_ (DynEnum::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynEnum_var::~DynEnum_var (void) // destructor
+DynamicAny::DynEnum_var::~DynEnum_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -916,7 +1002,7 @@ DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // c
   return this->ptr_;
 }
 
-DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast
+DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -991,10 +1077,11 @@ DynamicAny::DynEnum_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynEnum_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
@@ -1003,14 +1090,14 @@ DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
   this->ptr_ = ::DynamicAny::DynEnum::_nil ();
 }
 
-DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p) // constructor from _var
+DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynEnum::_nil ();
 }
 
-DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p) // copy constructor
+DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p)
   : ptr_ (ACE_const_cast (DynEnum_out &, p).ptr_)
 {}
 
@@ -1041,7 +1128,7 @@ DynamicAny::DynEnum_out::operator ::DynamicAny::DynEnum_ptr &() // cast
 }
 
 ::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_out::ptr (void) // ptr
+DynamicAny::DynEnum_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1052,9 +1139,8 @@ DynamicAny::DynEnum_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynEnum::DynEnum (void)
 {}
@@ -1062,7 +1148,8 @@ DynamicAny::DynEnum::DynEnum (void)
 DynamicAny::DynEnum::~DynEnum (void)
 {}
 
-DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow (
+DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1070,62 +1157,82 @@ DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow (
   return DynEnum::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_ptr 
 DynamicAny::DynEnum::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynEnum::_nil ();
+    {
+      return DynEnum::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynEnum_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynEnum::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynEnum::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynEnum)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynEnum)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1134,112 +1241,14 @@ const char* DynamicAny::DynEnum::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynEnum:1.0";
 }
 
-static const CORBA::Long _oc_DynamicAny_FieldName[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f46),
-  ACE_NTOHL (0x69656c64),
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0
-  10,
-  ACE_NTOHL (0x4669656c),
-  ACE_NTOHL (0x644e616d),
-  ACE_NTOHL (0x65000000),  // name = FieldName
-  CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_FieldName (
-    CORBA::tk_alias,
-    sizeof (_oc_DynamicAny_FieldName),
-    (char *) &_oc_DynamicAny_FieldName,
-    0,
-    sizeof (DynamicAny::FieldName)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FieldName, &_tc_TAO_tc_DynamicAny_FieldName)
-TAO_NAMESPACE_END
-
-static const CORBA::Long _oc_DynamicAny_NameValuePair[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f4e),
-  ACE_NTOHL (0x616d6556),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x50616972),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/NameValuePair:1.0
-  14,
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65506169),
-  ACE_NTOHL (0x72000000),  // name = NameValuePair
-  2, // member count
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x44796e61),
-    ACE_NTOHL (0x6d696341),
-    ACE_NTOHL (0x6e792f46),
-    ACE_NTOHL (0x69656c64),
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),  // name = FieldName
-    CORBA::tk_string,
-    0U, // string length
-
-  6,
-  ACE_NTOHL (0x76616c75),
-  ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePair (
-    CORBA::tk_struct,
-    sizeof (_oc_DynamicAny_NameValuePair),
-    (char *) &_oc_DynamicAny_NameValuePair,
-    0,
-    sizeof (DynamicAny::NameValuePair)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NameValuePair, &_tc_TAO_tc_DynamicAny_NameValuePair)
-TAO_NAMESPACE_END
-
-void DynamicAny::NameValuePair::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NameValuePair *tmp = ACE_static_cast (NameValuePair*, _tao_void_pointer);
-  delete tmp;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
@@ -1250,18 +1259,23 @@ DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_allocate_buffe
 {
   DynamicAny::NameValuePair* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    DynamicAny::NameValuePair *old = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old);
-
-  }
+    {
+      DynamicAny::NameValuePair *old =
+        ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1269,164 +1283,94 @@ void
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  DynamicAny::NameValuePair *tmp =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Dtor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::NameValuePairSeq
 // *************************************************************
 
 DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
 {}
-DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameValuePair *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::NameValuePairSeq::NameValuePairSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameValuePair *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq) // copy ctor
-  :
+
+DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::NameValuePairSeq::~NameValuePairSeq (void) // dtor
 {}
-void DynamicAny::NameValuePairSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NameValuePairSeq *tmp = ACE_static_cast (NameValuePairSeq*, _tao_void_pointer);
-  delete tmp;
-}
+
 
 
 #endif /* end #if !defined */
 
-static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f4e),
-  ACE_NTOHL (0x616d6556),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x50616972),
-  ACE_NTOHL (0x5365713a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/DynamicAny/NameValuePairSeq:1.0
-  17,
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65506169),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x0),  // name = NameValuePairSeq
-  CORBA::tk_sequence, // typecode kind
-  196, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    180, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      41,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x44796e61),
-      ACE_NTOHL (0x6d696341),
-      ACE_NTOHL (0x6e792f4e),
-      ACE_NTOHL (0x616d6556),
-      ACE_NTOHL (0x616c7565),
-      ACE_NTOHL (0x50616972),
-      ACE_NTOHL (0x3a312e30),
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/NameValuePair:1.0
-      14,
-      ACE_NTOHL (0x4e616d65),
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x65506169),
-      ACE_NTOHL (0x72000000),  // name = NameValuePair
-      2, // member count
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x44796e61),
-        ACE_NTOHL (0x6d696341),
-        ACE_NTOHL (0x6e792f46),
-        ACE_NTOHL (0x69656c64),
-        ACE_NTOHL (0x4e616d65),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0
-        10,
-        ACE_NTOHL (0x4669656c),
-        ACE_NTOHL (0x644e616d),
-        ACE_NTOHL (0x65000000),  // name = FieldName
-        CORBA::tk_string,
-        0U, // string length
-
-      6,
-      ACE_NTOHL (0x76616c75),
-      ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_any,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePairSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_DynamicAny_NameValuePairSeq),
-    (char *) &_oc_DynamicAny_NameValuePairSeq,
-    0,
-    sizeof (DynamicAny::NameValuePairSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NameValuePairSeq, &_tc_TAO_tc_DynamicAny_NameValuePairSeq)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
@@ -1437,18 +1381,23 @@ DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_allocate_buff
 {
   DynamicAny::NameDynAnyPair* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    DynamicAny::NameDynAnyPair *old = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old);
-
-  }
+    {
+      DynamicAny::NameDynAnyPair *old =
+        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1456,72 +1405,89 @@ void
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  DynamicAny::NameDynAnyPair *tmp =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Dtor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::NameDynAnyPairSeq
 // *************************************************************
 
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
 {}
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameDynAnyPair *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameDynAnyPair *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq) // copy ctor
-  :
+
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) // dtor
 {}
-void DynamicAny::NameDynAnyPairSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NameDynAnyPairSeq *tmp = ACE_static_cast (NameDynAnyPairSeq*, _tao_void_pointer);
-  delete tmp;
-}
+
 
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynStruct::_tao_class_id = 0;
 
 DynamicAny::DynStruct_ptr
@@ -1567,13 +1533,23 @@ tao_DynamicAny_DynStruct_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynStruct_marshal (
+    DynamicAny::DynStruct_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynStruct_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynStruct_var::DynStruct_var (void) // default constructor
+DynamicAny::DynStruct_var::DynStruct_var (void)
   : ptr_ (DynStruct::_nil ())
 {}
 
@@ -1583,12 +1559,12 @@ DynamicAny::DynStruct_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p) // copy constructor
+DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p)
   : TAO_Base_var (),
     ptr_ (DynStruct::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynStruct_var::~DynStruct_var (void) // destructor
+DynamicAny::DynStruct_var::~DynStruct_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1617,7 +1593,7 @@ DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const
   return this->ptr_;
 }
 
-DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast
+DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1692,10 +1668,11 @@ DynamicAny::DynStruct_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynStruct_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
@@ -1704,14 +1681,14 @@ DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
   this->ptr_ = ::DynamicAny::DynStruct::_nil ();
 }
 
-DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p) // constructor from _var
+DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynStruct::_nil ();
 }
 
-DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p) // copy constructor
+DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p)
   : ptr_ (ACE_const_cast (DynStruct_out &, p).ptr_)
 {}
 
@@ -1742,7 +1719,7 @@ DynamicAny::DynStruct_out::operator ::DynamicAny::DynStruct_ptr &() // cast
 }
 
 ::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_out::ptr (void) // ptr
+DynamicAny::DynStruct_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1753,9 +1730,8 @@ DynamicAny::DynStruct_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynStruct::DynStruct (void)
 {}
@@ -1763,7 +1739,8 @@ DynamicAny::DynStruct::DynStruct (void)
 DynamicAny::DynStruct::~DynStruct (void)
 {}
 
-DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow (
+DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1771,62 +1748,82 @@ DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow (
   return DynStruct::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_ptr 
 DynamicAny::DynStruct::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynStruct::_nil ();
+    {
+      return DynStruct::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynStruct_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynStruct::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynStruct::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynStruct)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynStruct)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1835,6 +1832,9 @@ const char* DynamicAny::DynStruct::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynStruct:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynUnion::_tao_class_id = 0;
 
 DynamicAny::DynUnion_ptr
@@ -1880,13 +1880,23 @@ tao_DynamicAny_DynUnion_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynUnion_marshal (
+    DynamicAny::DynUnion_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynUnion_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynUnion_var::DynUnion_var (void) // default constructor
+DynamicAny::DynUnion_var::DynUnion_var (void)
   : ptr_ (DynUnion::_nil ())
 {}
 
@@ -1896,12 +1906,12 @@ DynamicAny::DynUnion_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p) // copy constructor
+DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p)
   : TAO_Base_var (),
     ptr_ (DynUnion::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynUnion_var::~DynUnion_var (void) // destructor
+DynamicAny::DynUnion_var::~DynUnion_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1930,7 +1940,7 @@ DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast
+DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2005,10 +2015,11 @@ DynamicAny::DynUnion_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynUnion_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
@@ -2017,14 +2028,14 @@ DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
   this->ptr_ = ::DynamicAny::DynUnion::_nil ();
 }
 
-DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p) // constructor from _var
+DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynUnion::_nil ();
 }
 
-DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p) // copy constructor
+DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p)
   : ptr_ (ACE_const_cast (DynUnion_out &, p).ptr_)
 {}
 
@@ -2055,7 +2066,7 @@ DynamicAny::DynUnion_out::operator ::DynamicAny::DynUnion_ptr &() // cast
 }
 
 ::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_out::ptr (void) // ptr
+DynamicAny::DynUnion_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2066,9 +2077,8 @@ DynamicAny::DynUnion_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynUnion::DynUnion (void)
 {}
@@ -2076,7 +2086,8 @@ DynamicAny::DynUnion::DynUnion (void)
 DynamicAny::DynUnion::~DynUnion (void)
 {}
 
-DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow (
+DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2084,62 +2095,82 @@ DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow (
   return DynUnion::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_ptr 
 DynamicAny::DynUnion::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynUnion::_nil ();
+    {
+      return DynUnion::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynUnion_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynUnion::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynUnion::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynUnion)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynUnion)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2148,6 +2179,8 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynUnion:1.0";
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2159,18 +2192,23 @@ DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_allocate_buffer (CORBA::
 {
   CORBA::Any* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old);
-
-  }
+    {
+      CORBA::Any *old =
+        ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -2178,110 +2216,88 @@ void
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  CORBA::Any *tmp =
+    ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Dtor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_ANYSEQ_CS_)
 #define _DYNAMICANY_ANYSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::AnySeq
 // *************************************************************
 
 DynamicAny::AnySeq::AnySeq (void)
 {}
-DynamicAny::AnySeq::AnySeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::AnySeq::AnySeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::AnySeq::AnySeq (CORBA::ULong max, CORBA::ULong length, CORBA::Any *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::AnySeq::AnySeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Any *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::AnySeq::AnySeq (const AnySeq &seq) // copy ctor
-  :
+
+DynamicAny::AnySeq::AnySeq (const AnySeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::AnySeq::~AnySeq (void) // dtor
 {}
-void DynamicAny::AnySeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AnySeq *tmp = ACE_static_cast (AnySeq*, _tao_void_pointer);
-  delete tmp;
-}
 
 
-#endif /* end #if !defined */
 
-static const CORBA::Long _oc_DynamicAny_AnySeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f41),
-  ACE_NTOHL (0x6e795365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/DynamicAny/AnySeq:1.0
-  7,
-  ACE_NTOHL (0x416e7953),
-  ACE_NTOHL (0x65710000),  // name = AnySeq
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_any,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_AnySeq (
-    CORBA::tk_alias,
-    sizeof (_oc_DynamicAny_AnySeq),
-    (char *) &_oc_DynamicAny_AnySeq,
-    0,
-    sizeof (DynamicAny::AnySeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AnySeq, &_tc_TAO_tc_DynamicAny_AnySeq)
-TAO_NAMESPACE_END
+#endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2294,27 +2310,29 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_allocate_buffe
 {
   DynamicAny::DynAny **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -2322,15 +2340,18 @@ void
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = DynamicAny::DynAny::_nil ();
     }
-
+  
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -2344,7 +2365,7 @@ void
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -2352,7 +2373,7 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer
     }
 }
 
-void
+void 
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
     void* target,
     CORBA::Object *src
@@ -2373,56 +2394,72 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
 #define _DYNAMICANY_DYNANYSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::DynAnySeq
 // *************************************************************
 
 DynamicAny::DynAnySeq::DynAnySeq (void)
 {}
-DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::DynAny_ptr *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::DynAnySeq::DynAnySeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::DynAny_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq) // copy ctor
-  :
+
+DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::DynAnySeq::~DynAnySeq (void) // dtor
 {}
-void DynamicAny::DynAnySeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DynAnySeq *tmp = ACE_static_cast (DynAnySeq*, _tao_void_pointer);
-  delete tmp;
-}
+
 
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynSequence::_tao_class_id = 0;
 
 DynamicAny::DynSequence_ptr
@@ -2468,13 +2505,23 @@ tao_DynamicAny_DynSequence_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynSequence_marshal (
+    DynamicAny::DynSequence_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynSequence_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynSequence_var::DynSequence_var (void) // default constructor
+DynamicAny::DynSequence_var::DynSequence_var (void)
   : ptr_ (DynSequence::_nil ())
 {}
 
@@ -2484,12 +2531,12 @@ DynamicAny::DynSequence_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p) // copy constructor
+DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p)
   : TAO_Base_var (),
     ptr_ (DynSequence::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynSequence_var::~DynSequence_var (void) // destructor
+DynamicAny::DynSequence_var::~DynSequence_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2518,7 +2565,7 @@ DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() co
   return this->ptr_;
 }
 
-DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast
+DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2593,10 +2640,11 @@ DynamicAny::DynSequence_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynSequence_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
@@ -2605,14 +2653,14 @@ DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
   this->ptr_ = ::DynamicAny::DynSequence::_nil ();
 }
 
-DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p) // constructor from _var
+DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynSequence::_nil ();
 }
 
-DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p) // copy constructor
+DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p)
   : ptr_ (ACE_const_cast (DynSequence_out &, p).ptr_)
 {}
 
@@ -2643,7 +2691,7 @@ DynamicAny::DynSequence_out::operator ::DynamicAny::DynSequence_ptr &() // cast
 }
 
 ::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_out::ptr (void) // ptr
+DynamicAny::DynSequence_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2654,9 +2702,8 @@ DynamicAny::DynSequence_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynSequence::DynSequence (void)
 {}
@@ -2664,7 +2711,8 @@ DynamicAny::DynSequence::DynSequence (void)
 DynamicAny::DynSequence::~DynSequence (void)
 {}
 
-DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow (
+DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2672,62 +2720,82 @@ DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow (
   return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_ptr 
 DynamicAny::DynSequence::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynSequence::_nil ();
+    {
+      return DynSequence::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynSequence_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynSequence::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynSequence::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynSequence_ptr
 DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2736,6 +2804,9 @@ const char* DynamicAny::DynSequence::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynSequence:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynArray::_tao_class_id = 0;
 
 DynamicAny::DynArray_ptr
@@ -2781,13 +2852,23 @@ tao_DynamicAny_DynArray_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynArray_marshal (
+    DynamicAny::DynArray_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynArray_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynArray_var::DynArray_var (void) // default constructor
+DynamicAny::DynArray_var::DynArray_var (void)
   : ptr_ (DynArray::_nil ())
 {}
 
@@ -2797,12 +2878,12 @@ DynamicAny::DynArray_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p) // copy constructor
+DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p)
   : TAO_Base_var (),
     ptr_ (DynArray::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynArray_var::~DynArray_var (void) // destructor
+DynamicAny::DynArray_var::~DynArray_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2831,7 +2912,7 @@ DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast
+DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2906,10 +2987,11 @@ DynamicAny::DynArray_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynArray_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
@@ -2918,14 +3000,14 @@ DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
   this->ptr_ = ::DynamicAny::DynArray::_nil ();
 }
 
-DynamicAny::DynArray_out::DynArray_out (DynArray_var &p) // constructor from _var
+DynamicAny::DynArray_out::DynArray_out (DynArray_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynArray::_nil ();
 }
 
-DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p) // copy constructor
+DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p)
   : ptr_ (ACE_const_cast (DynArray_out &, p).ptr_)
 {}
 
@@ -2956,7 +3038,7 @@ DynamicAny::DynArray_out::operator ::DynamicAny::DynArray_ptr &() // cast
 }
 
 ::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_out::ptr (void) // ptr
+DynamicAny::DynArray_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2967,9 +3049,8 @@ DynamicAny::DynArray_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynArray::DynArray (void)
 {}
@@ -2977,7 +3058,8 @@ DynamicAny::DynArray::DynArray (void)
 DynamicAny::DynArray::~DynArray (void)
 {}
 
-DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow (
+DynamicAny::DynArray_ptr
+DynamicAny::DynArray::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2985,62 +3067,82 @@ DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow (
   return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynArray_ptr
+DynamicAny::DynArray_ptr 
 DynamicAny::DynArray::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynArray::_nil ();
+    {
+      return DynArray::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynArray_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynArray::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynArray::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynArray_ptr
 DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3049,6 +3151,9 @@ const char* DynamicAny::DynArray::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynArray:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynValue::_tao_class_id = 0;
 
 DynamicAny::DynValue_ptr
@@ -3094,13 +3199,23 @@ tao_DynamicAny_DynValue_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynValue_marshal (
+    DynamicAny::DynValue_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynValue_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynValue_var::DynValue_var (void) // default constructor
+DynamicAny::DynValue_var::DynValue_var (void)
   : ptr_ (DynValue::_nil ())
 {}
 
@@ -3110,12 +3225,12 @@ DynamicAny::DynValue_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p) // copy constructor
+DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p)
   : TAO_Base_var (),
     ptr_ (DynValue::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynValue_var::~DynValue_var (void) // destructor
+DynamicAny::DynValue_var::~DynValue_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3144,7 +3259,7 @@ DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast
+DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3219,10 +3334,11 @@ DynamicAny::DynValue_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynValue_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
@@ -3231,14 +3347,14 @@ DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
   this->ptr_ = ::DynamicAny::DynValue::_nil ();
 }
 
-DynamicAny::DynValue_out::DynValue_out (DynValue_var &p) // constructor from _var
+DynamicAny::DynValue_out::DynValue_out (DynValue_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynValue::_nil ();
 }
 
-DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p) // copy constructor
+DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p)
   : ptr_ (ACE_const_cast (DynValue_out &, p).ptr_)
 {}
 
@@ -3269,7 +3385,7 @@ DynamicAny::DynValue_out::operator ::DynamicAny::DynValue_ptr &() // cast
 }
 
 ::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_out::ptr (void) // ptr
+DynamicAny::DynValue_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3280,9 +3396,8 @@ DynamicAny::DynValue_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynValue::DynValue (void)
 {}
@@ -3290,7 +3405,8 @@ DynamicAny::DynValue::DynValue (void)
 DynamicAny::DynValue::~DynValue (void)
 {}
 
-DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow (
+DynamicAny::DynValue_ptr
+DynamicAny::DynValue::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3298,62 +3414,82 @@ DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow (
   return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynValue_ptr
+DynamicAny::DynValue_ptr 
 DynamicAny::DynValue::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynValue::_nil ();
+    {
+      return DynValue::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynValue_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynValue::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynValue::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynValue_ptr
 DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3362,6 +3498,9 @@ const char* DynamicAny::DynValue::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynValue:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynAnyFactory::_tao_class_id = 0;
 
 DynamicAny::DynAnyFactory_ptr
@@ -3407,13 +3546,23 @@ tao_DynamicAny_DynAnyFactory_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynAnyFactory_marshal (
+    DynamicAny::DynAnyFactory_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynAnyFactory_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void) // default constructor
+DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void)
   : ptr_ (DynAnyFactory::_nil ())
 {}
 
@@ -3423,12 +3572,12 @@ DynamicAny::DynAnyFactory_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p) // copy constructor
+DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p)
   : TAO_Base_var (),
     ptr_ (DynAnyFactory::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void) // destructor
+DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3457,7 +3606,7 @@ DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &(
   return this->ptr_;
 }
 
-DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast
+DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3532,10 +3681,11 @@ DynamicAny::DynAnyFactory_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynAnyFactory_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
@@ -3544,14 +3694,14 @@ DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
   this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
 }
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p) // constructor from _var
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
 }
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p) // copy constructor
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p)
   : ptr_ (ACE_const_cast (DynAnyFactory_out &, p).ptr_)
 {}
 
@@ -3582,7 +3732,7 @@ DynamicAny::DynAnyFactory_out::operator ::DynamicAny::DynAnyFactory_ptr &() // c
 }
 
 ::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_out::ptr (void) // ptr
+DynamicAny::DynAnyFactory_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3593,9 +3743,8 @@ DynamicAny::DynAnyFactory_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynAnyFactory::DynAnyFactory (void)
 {}
@@ -3603,7 +3752,8 @@ DynamicAny::DynAnyFactory::DynAnyFactory (void)
 DynamicAny::DynAnyFactory::~DynAnyFactory (void)
 {}
 
-DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow (
+DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3611,50 +3761,68 @@ DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow (
   return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_ptr 
 DynamicAny::DynAnyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynAnyFactory::_nil ();
+    {
+      return DynAnyFactory::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynAnyFactory_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynAnyFactory::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynAnyFactory::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynAnyFactory_ptr
 DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3663,7 +3831,9 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
   : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
@@ -3672,12 +3842,10 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
 {
 }
 
-// Copy constructor.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -3686,7 +3854,6 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::D
 {
 }
 
-// Assignment operator.
 DynamicAny::DynAnyFactory::InconsistentTypeCode&
 DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
 {
@@ -3695,11 +3862,11 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::
 }
 
 DynamicAny::DynAnyFactory::InconsistentTypeCode *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *exc)
+DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InconsistentTypeCode *, exc);
+      return ACE_dynamic_cast (InconsistentTypeCode *, _tao_excp);
     }
   else
     {
@@ -3720,13 +3887,13 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode (*this),
+      ::DynamicAny::DynAnyFactory::InconsistentTypeCode (*this),
       0
     );
   return result;
 }
 
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise ()
+void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -3747,350 +3914,32 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynFixed,DynamicAny::DynFixed_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynFixed,DynamicAny::DynFixed_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynEnum,DynamicAny::DynEnum_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynEnum,DynamicAny::DynEnum_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const DynamicAny::NameValuePair &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_NameValuePair,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, DynamicAny::NameValuePair *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_NameValuePair,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      DynamicAny::NameValuePair::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, DynamicAny::NameValuePair *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(const DynamicAny::NameValuePair*&,_tao_elem);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameValuePair *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const DynamicAny::NameValuePair*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      DynamicAny::NameValuePair *tmp;
-      ACE_NEW_RETURN (tmp, DynamicAny::NameValuePair, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            DynamicAny::_tc_NameValuePair,
-            1,
-            ACE_static_cast (void *, tmp),
-            DynamicAny::NameValuePair::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const DynamicAny::NameValuePairSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        DynamicAny::_tc_NameValuePairSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, DynamicAny::NameValuePairSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_NameValuePairSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      DynamicAny::NameValuePairSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, DynamicAny::NameValuePairSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const DynamicAny::NameValuePairSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameValuePairSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const DynamicAny::NameValuePairSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      DynamicAny::NameValuePairSeq *tmp;
-      ACE_NEW_RETURN (tmp, DynamicAny::NameValuePairSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            DynamicAny::_tc_NameValuePairSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            DynamicAny::NameValuePairSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynStruct,DynamicAny::DynStruct_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynStruct,DynamicAny::DynStruct_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynUnion,DynamicAny::DynUnion_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynUnion,DynamicAny::DynUnion_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const DynamicAny::AnySeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        DynamicAny::_tc_AnySeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, DynamicAny::AnySeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_AnySeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      DynamicAny::AnySeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, DynamicAny::AnySeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const DynamicAny::AnySeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
-    if (!result)
-      return 0; // not equivalent
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const DynamicAny::AnySeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      DynamicAny::AnySeq *tmp;
-      ACE_NEW_RETURN (tmp, DynamicAny::AnySeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            DynamicAny::_tc_AnySeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            DynamicAny::AnySeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynSequence,DynamicAny::DynSequence_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynSequence,DynamicAny::DynSequence_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynArray,DynamicAny::DynArray_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynArray,DynamicAny::DynArray_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynValue,DynamicAny::DynValue_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynValue,DynamicAny::DynValue_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynAnyFactory,DynamicAny::DynAnyFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynAnyFactory,DynamicAny::DynAnyFactory_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4099,45 +3948,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const DynamicAny::AnySeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4146,25 +4014,36 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 8051a77603d..c21b9584550 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
 #define _TAO_IDL_ORIG_DYNAMICANYC_H_
 
@@ -59,21 +62,29 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  DynamicAny
 {
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNANY___PTR_CH_)
 #define _DYNAMICANY_DYNANY___PTR_CH_
   
   class DynAny;
   typedef DynAny *DynAny_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANY___VAR_CH_)
 #define _DYNAMICANY_DYNANY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynAny_var : public TAO_Base_var
   {
   public:
@@ -113,13 +124,14 @@ TAO_NAMESPACE  DynamicAny
     DynAny_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANY___OUT_CH_)
 #define _DYNAMICANY_DYNANY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynAny_out
   {
   public:
@@ -136,11 +148,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynAny_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNANY_CH_)
 #define _DYNAMICANY_DYNANY_CH_
   
@@ -148,11 +161,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynAny_ptr _ptr_type;
     typedef DynAny_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -174,6 +184,10 @@ TAO_NAMESPACE  DynamicAny
       }
     
     
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
 #define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
     
@@ -186,7 +200,7 @@ TAO_NAMESPACE  DynamicAny
       ~InvalidValue (void);
 
       InvalidValue &operator= (const InvalidValue &);
-
+      
       static InvalidValue *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -204,13 +218,15 @@ TAO_NAMESPACE  DynamicAny
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
 #define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
     
@@ -223,7 +239,7 @@ TAO_NAMESPACE  DynamicAny
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-
+      
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -241,20 +257,25 @@ TAO_NAMESPACE  DynamicAny
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void assign (
         DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -264,6 +285,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void from_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -274,14 +298,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * to_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean equal (
         DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -290,22 +319,29 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr copy (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_boolean (
         CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -316,6 +352,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_octet (
         CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -326,6 +365,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_char (
         CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -336,6 +378,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_short (
         CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -346,6 +391,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_ushort (
         CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -356,6 +404,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_long (
         CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -366,6 +417,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_ulong (
         CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -376,6 +430,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_float (
         CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -386,6 +443,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_double (
         CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -396,6 +456,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -406,6 +469,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_reference (
         CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -416,6 +482,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_typecode (
         CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -426,6 +495,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_longlong (
         CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -436,6 +508,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_ulonglong (
         CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -446,6 +521,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_longdouble (
         CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -456,6 +534,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_wchar (
         CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -466,6 +547,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_wstring (
         const CORBA::WChar * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -476,6 +560,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -486,6 +573,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_dyn_any (
         DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -496,6 +586,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_val (
         CORBA::ValueBase_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -506,8 +599,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean get_boolean (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -516,8 +611,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Octet get_octet (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -526,8 +623,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Char get_char (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -536,8 +635,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Short get_short (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -546,8 +647,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::UShort get_ushort (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -556,8 +659,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long get_long (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -566,8 +671,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_ulong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -576,8 +683,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Float get_float (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -586,8 +695,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Double get_double (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -596,8 +707,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * get_string (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -606,8 +719,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr get_reference (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -616,8 +731,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr get_typecode (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -626,8 +743,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::LongLong get_longlong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -636,8 +755,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULongLong get_ulonglong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -646,8 +767,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::LongDouble get_longdouble (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -656,8 +779,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::WChar get_wchar (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -666,8 +791,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::WChar * get_wstring (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -676,8 +803,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * get_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -686,8 +815,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr get_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -696,8 +827,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ValueBase_ptr get_val (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -706,6 +839,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean seek (
         CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -714,32 +850,40 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void rewind (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean next (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong component_count (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr current_component (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -747,36 +891,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynAny (void);
-    
     virtual ~DynAny (void);
+    
+    friend class _TAO_DynAny_Remote_Proxy_Impl;
+    friend class _TAO_DynAny_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynAny_Direct_Proxy_Impl;
   
   private:
     DynAny (const DynAny &);
     void operator= (const DynAny &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNFIXED___PTR_CH_)
 #define _DYNAMICANY_DYNFIXED___PTR_CH_
   
   class DynFixed;
   typedef DynFixed *DynFixed_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNFIXED___VAR_CH_)
 #define _DYNAMICANY_DYNFIXED___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynFixed_var : public TAO_Base_var
   {
   public:
@@ -816,13 +970,14 @@ TAO_NAMESPACE  DynamicAny
     DynFixed_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNFIXED___OUT_CH_)
 #define _DYNAMICANY_DYNFIXED___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynFixed_out
   {
   public:
@@ -839,11 +994,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynFixed_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNFIXED_CH_)
 #define _DYNAMICANY_DYNFIXED_CH_
   
@@ -851,11 +1007,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynFixed_ptr _ptr_type;
     typedef DynFixed_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -876,14 +1029,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynFixed_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * get_value (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_value (
         const char * val
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -894,36 +1054,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynFixed (void);
-    
     virtual ~DynFixed (void);
+    
+    friend class _TAO_DynFixed_Remote_Proxy_Impl;
+    friend class _TAO_DynFixed_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynFixed_Direct_Proxy_Impl;
   
   private:
     DynFixed (const DynFixed &);
     void operator= (const DynFixed &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNENUM___PTR_CH_)
 #define _DYNAMICANY_DYNENUM___PTR_CH_
   
   class DynEnum;
   typedef DynEnum *DynEnum_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNENUM___VAR_CH_)
 #define _DYNAMICANY_DYNENUM___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynEnum_var : public TAO_Base_var
   {
   public:
@@ -963,13 +1133,14 @@ TAO_NAMESPACE  DynamicAny
     DynEnum_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNENUM___OUT_CH_)
 #define _DYNAMICANY_DYNENUM___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynEnum_out
   {
   public:
@@ -986,11 +1157,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynEnum_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNENUM_CH_)
 #define _DYNAMICANY_DYNENUM_CH_
   
@@ -998,11 +1170,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynEnum_ptr _ptr_type;
     typedef DynEnum_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1023,14 +1192,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynEnum_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * get_as_string (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_as_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1040,14 +1216,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_as_ulong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_as_ulong (
         CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1057,45 +1238,53 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynEnum (void);
-    
     virtual ~DynEnum (void);
+    
+    friend class _TAO_DynEnum_Remote_Proxy_Impl;
+    friend class _TAO_DynEnum_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynEnum_Direct_Proxy_Impl;
   
   private:
     DynEnum (const DynEnum &);
     void operator= (const DynEnum &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
   typedef CORBA::String_out FieldName_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FieldName;
   
-  struct NameValuePair;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class NameValuePair_var;
   
   struct TAO_DynamicAny_Export NameValuePair
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameValuePair_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
+    
     
     TAO_String_Manager id;
     CORBA::Any value;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_DynamicAny_Export NameValuePair_var
   {
   public:
@@ -1112,6 +1301,7 @@ TAO_NAMESPACE  DynamicAny
     operator const NameValuePair &() const;
     operator NameValuePair &();
     operator NameValuePair &() const;
+    
     // Variable-size types only.
     operator NameValuePair *&();
     
@@ -1126,6 +1316,9 @@ TAO_NAMESPACE  DynamicAny
     NameValuePair *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_DynamicAny_Export NameValuePair_out
   {
   public:
@@ -1144,19 +1337,18 @@ TAO_NAMESPACE  DynamicAny
     void operator= (const NameValuePair_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NameValuePair;
-  
-  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void);
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
@@ -1193,55 +1385,59 @@ TAO_NAMESPACE  DynamicAny
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class NameValuePairSeq;
   class NameValuePairSeq_var;
   
   // *************************************************************
-  // NameValuePairSeq
+  // DynamicAny::NameValuePairSeq
   // *************************************************************
   
   class TAO_DynamicAny_Export NameValuePairSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<NameValuePair>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    NameValuePairSeq (void); // default ctor
-    NameValuePairSeq (CORBA::ULong max); // uses max size
+    NameValuePairSeq (void);
+    NameValuePairSeq (CORBA::ULong max);
     NameValuePairSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         NameValuePair *buffer, 
         CORBA::Boolean release = 0
       );
-    NameValuePairSeq (const NameValuePairSeq &); // copy ctor
+    NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameValuePairSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::NameValuePairSeq_var
   // *************************************************************
@@ -1262,7 +1458,9 @@ TAO_NAMESPACE  DynamicAny
     operator const NameValuePairSeq &() const;
     operator NameValuePairSeq &();
     operator NameValuePairSeq &() const;
-    operator NameValuePairSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator NameValuePairSeq *&();
     
     NameValuePair & operator[] (CORBA::ULong index);
     const NameValuePair & operator[] (CORBA::ULong index) const;
@@ -1277,14 +1475,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     NameValuePairSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export NameValuePairSeq_out
   {
   public:
@@ -1303,27 +1502,26 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const NameValuePairSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NameValuePairSeq;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
   
-  struct NameDynAnyPair;
   class NameDynAnyPair_var;
   
   struct TAO_DynamicAny_Export NameDynAnyPair
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameDynAnyPair_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    TAO_String_Manager id;
-    ACE_NESTED_CLASS (DynamicAny, DynAny_var) value;
     
+    
+    TAO_String_Manager id;
+    DynamicAny::DynAny_var value;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_DynamicAny_Export NameDynAnyPair_var
   {
   public:
@@ -1340,6 +1538,7 @@ TAO_NAMESPACE  DynamicAny
     operator const NameDynAnyPair &() const;
     operator NameDynAnyPair &();
     operator NameDynAnyPair &() const;
+    
     // Variable-size types only.
     operator NameDynAnyPair *&();
     
@@ -1354,6 +1553,9 @@ TAO_NAMESPACE  DynamicAny
     NameDynAnyPair *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_DynamicAny_Export NameDynAnyPair_out
   {
   public:
@@ -1372,17 +1574,18 @@ TAO_NAMESPACE  DynamicAny
     void operator= (const NameDynAnyPair_var &);
   };
   
-  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void);
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
@@ -1419,55 +1622,59 @@ TAO_NAMESPACE  DynamicAny
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class NameDynAnyPairSeq;
   class NameDynAnyPairSeq_var;
   
   // *************************************************************
-  // NameDynAnyPairSeq
+  // DynamicAny::NameDynAnyPairSeq
   // *************************************************************
   
   class TAO_DynamicAny_Export NameDynAnyPairSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<NameDynAnyPair>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    NameDynAnyPairSeq (void); // default ctor
-    NameDynAnyPairSeq (CORBA::ULong max); // uses max size
+    NameDynAnyPairSeq (void);
+    NameDynAnyPairSeq (CORBA::ULong max);
     NameDynAnyPairSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         NameDynAnyPair *buffer, 
         CORBA::Boolean release = 0
       );
-    NameDynAnyPairSeq (const NameDynAnyPairSeq &); // copy ctor
+    NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameDynAnyPairSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::NameDynAnyPairSeq_var
   // *************************************************************
@@ -1488,7 +1695,9 @@ TAO_NAMESPACE  DynamicAny
     operator const NameDynAnyPairSeq &() const;
     operator NameDynAnyPairSeq &();
     operator NameDynAnyPairSeq &() const;
-    operator NameDynAnyPairSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator NameDynAnyPairSeq *&();
     
     NameDynAnyPair & operator[] (CORBA::ULong index);
     const NameDynAnyPair & operator[] (CORBA::ULong index) const;
@@ -1503,14 +1712,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     NameDynAnyPairSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export NameDynAnyPairSeq_out
   {
   public:
@@ -1529,23 +1739,26 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const NameDynAnyPairSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNSTRUCT___PTR_CH_)
 #define _DYNAMICANY_DYNSTRUCT___PTR_CH_
   
   class DynStruct;
   typedef DynStruct *DynStruct_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSTRUCT___VAR_CH_)
 #define _DYNAMICANY_DYNSTRUCT___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynStruct_var : public TAO_Base_var
   {
   public:
@@ -1585,13 +1798,14 @@ TAO_NAMESPACE  DynamicAny
     DynStruct_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSTRUCT___OUT_CH_)
 #define _DYNAMICANY_DYNSTRUCT___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynStruct_out
   {
   public:
@@ -1608,11 +1822,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynStruct_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
 #define _DYNAMICANY_DYNSTRUCT_CH_
   
@@ -1620,11 +1835,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynStruct_ptr _ptr_type;
     typedef DynStruct_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1645,8 +1857,12 @@ TAO_NAMESPACE  DynamicAny
         return (DynStruct_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * current_member_name (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1655,8 +1871,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
-    virtual CORBA::TCKind current_member_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1665,14 +1883,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameValuePairSeq * get_members (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1683,14 +1906,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1701,36 +1929,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynStruct (void);
-    
     virtual ~DynStruct (void);
+    
+    friend class _TAO_DynStruct_Remote_Proxy_Impl;
+    friend class _TAO_DynStruct_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynStruct_Direct_Proxy_Impl;
   
   private:
     DynStruct (const DynStruct &);
     void operator= (const DynStruct &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNUNION___PTR_CH_)
 #define _DYNAMICANY_DYNUNION___PTR_CH_
   
   class DynUnion;
   typedef DynUnion *DynUnion_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNUNION___VAR_CH_)
 #define _DYNAMICANY_DYNUNION___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynUnion_var : public TAO_Base_var
   {
   public:
@@ -1770,13 +2008,14 @@ TAO_NAMESPACE  DynamicAny
     DynUnion_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNUNION___OUT_CH_)
 #define _DYNAMICANY_DYNUNION___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynUnion_out
   {
   public:
@@ -1793,11 +2032,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynUnion_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNUNION_CH_)
 #define _DYNAMICANY_DYNUNION_CH_
   
@@ -1805,11 +2045,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynUnion_ptr _ptr_type;
     typedef DynUnion_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1830,14 +2067,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynUnion_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr get_discriminator (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_discriminator (
         DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1847,8 +2091,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_to_default_member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1856,8 +2102,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_to_no_active_member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1865,24 +2113,30 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean has_no_active_member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
-    virtual CORBA::TCKind discriminator_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind discriminator_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1890,8 +2144,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * member_name (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1899,8 +2155,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
-    virtual CORBA::TCKind member_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1908,34 +2166,41 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynUnion (void);
-    
     virtual ~DynUnion (void);
+    
+    friend class _TAO_DynUnion_Remote_Proxy_Impl;
+    friend class _TAO_DynUnion_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynUnion_Direct_Proxy_Impl;
   
   private:
     DynUnion (const DynUnion &);
     void operator= (const DynUnion &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_AnySeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_AnySeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq (void);
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq (
@@ -1972,55 +2237,59 @@ TAO_NAMESPACE  DynamicAny
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_ANYSEQ_CH_)
 #define _DYNAMICANY_ANYSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class AnySeq;
   class AnySeq_var;
   
   // *************************************************************
-  // AnySeq
+  // DynamicAny::AnySeq
   // *************************************************************
   
   class TAO_DynamicAny_Export AnySeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Any>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    AnySeq (void); // default ctor
-    AnySeq (CORBA::ULong max); // uses max size
+    AnySeq (void);
+    AnySeq (CORBA::ULong max);
     AnySeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::Any *buffer, 
         CORBA::Boolean release = 0
       );
-    AnySeq (const AnySeq &); // copy ctor
+    AnySeq (const AnySeq &);
     ~AnySeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef AnySeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_ANYSEQ___VAR_CH_)
 #define _DYNAMICANY_ANYSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::AnySeq_var
   // *************************************************************
@@ -2041,7 +2310,9 @@ TAO_NAMESPACE  DynamicAny
     operator const AnySeq &() const;
     operator AnySeq &();
     operator AnySeq &() const;
-    operator AnySeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator AnySeq *&();
     
     CORBA::Any & operator[] (CORBA::ULong index);
     const CORBA::Any & operator[] (CORBA::ULong index) const;
@@ -2056,14 +2327,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     AnySeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_ANYSEQ___OUT_CH_)
 #define _DYNAMICANY_ANYSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export AnySeq_out
   {
   public:
@@ -2082,23 +2354,21 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const AnySeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AnySeq;
-  
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void);
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
@@ -2139,55 +2409,59 @@ TAO_NAMESPACE  DynamicAny
       );
     virtual CORBA::Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
 #define _DYNAMICANY_DYNANYSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class DynAnySeq;
   class DynAnySeq_var;
   
   // *************************************************************
-  // DynAnySeq
+  // DynamicAny::DynAnySeq
   // *************************************************************
   
   class TAO_DynamicAny_Export DynAnySeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<DynAny,DynAny_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    DynAnySeq (void); // default ctor
-    DynAnySeq (CORBA::ULong max); // uses max size
+    DynAnySeq (void);
+    DynAnySeq (CORBA::ULong max);
     DynAnySeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         DynAny_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    DynAnySeq (const DynAnySeq &); // copy ctor
+    DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynAnySeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYSEQ___VAR_CH_)
 #define _DYNAMICANY_DYNANYSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::DynAnySeq_var
   // *************************************************************
@@ -2208,7 +2482,9 @@ TAO_NAMESPACE  DynamicAny
     operator const DynAnySeq &() const;
     operator DynAnySeq &();
     operator DynAnySeq &() const;
-    operator DynAnySeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator DynAnySeq *&();
     
     TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index);
     
@@ -2222,14 +2498,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynAnySeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYSEQ___OUT_CH_)
 #define _DYNAMICANY_DYNANYSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export DynAnySeq_out
   {
   public:
@@ -2248,23 +2525,26 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const DynAnySeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE___PTR_CH_)
 #define _DYNAMICANY_DYNSEQUENCE___PTR_CH_
   
   class DynSequence;
   typedef DynSequence *DynSequence_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE___VAR_CH_)
 #define _DYNAMICANY_DYNSEQUENCE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynSequence_var : public TAO_Base_var
   {
   public:
@@ -2304,13 +2584,14 @@ TAO_NAMESPACE  DynamicAny
     DynSequence_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE___OUT_CH_)
 #define _DYNAMICANY_DYNSEQUENCE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynSequence_out
   {
   public:
@@ -2327,11 +2608,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynSequence_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
 #define _DYNAMICANY_DYNSEQUENCE_CH_
   
@@ -2339,11 +2621,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynSequence_ptr _ptr_type;
     typedef DynSequence_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2364,14 +2643,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynSequence_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_length (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_length (
         CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2381,14 +2667,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::AnySeq * get_elements (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements (
         const DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2399,14 +2690,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2417,36 +2713,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynSequence (void);
-    
     virtual ~DynSequence (void);
+    
+    friend class _TAO_DynSequence_Remote_Proxy_Impl;
+    friend class _TAO_DynSequence_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynSequence_Direct_Proxy_Impl;
   
   private:
     DynSequence (const DynSequence &);
     void operator= (const DynSequence &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNARRAY___PTR_CH_)
 #define _DYNAMICANY_DYNARRAY___PTR_CH_
   
   class DynArray;
   typedef DynArray *DynArray_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNARRAY___VAR_CH_)
 #define _DYNAMICANY_DYNARRAY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynArray_var : public TAO_Base_var
   {
   public:
@@ -2486,13 +2792,14 @@ TAO_NAMESPACE  DynamicAny
     DynArray_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNARRAY___OUT_CH_)
 #define _DYNAMICANY_DYNARRAY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynArray_out
   {
   public:
@@ -2509,11 +2816,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynArray_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNARRAY_CH_)
 #define _DYNAMICANY_DYNARRAY_CH_
   
@@ -2521,11 +2829,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynArray_ptr _ptr_type;
     typedef DynArray_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2546,14 +2851,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynArray_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::AnySeq * get_elements (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements (
         const DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2564,14 +2876,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2582,36 +2899,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynArray (void);
-    
     virtual ~DynArray (void);
+    
+    friend class _TAO_DynArray_Remote_Proxy_Impl;
+    friend class _TAO_DynArray_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynArray_Direct_Proxy_Impl;
   
   private:
     DynArray (const DynArray &);
     void operator= (const DynArray &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNVALUE___PTR_CH_)
 #define _DYNAMICANY_DYNVALUE___PTR_CH_
   
   class DynValue;
   typedef DynValue *DynValue_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNVALUE___VAR_CH_)
 #define _DYNAMICANY_DYNVALUE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynValue_var : public TAO_Base_var
   {
   public:
@@ -2651,13 +2978,14 @@ TAO_NAMESPACE  DynamicAny
     DynValue_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNVALUE___OUT_CH_)
 #define _DYNAMICANY_DYNVALUE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynValue_out
   {
   public:
@@ -2674,11 +3002,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynValue_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNVALUE_CH_)
 #define _DYNAMICANY_DYNVALUE_CH_
   
@@ -2686,11 +3015,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynValue_ptr _ptr_type;
     typedef DynValue_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2711,8 +3037,12 @@ TAO_NAMESPACE  DynamicAny
         return (DynValue_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * current_member_name (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2721,8 +3051,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
-    virtual CORBA::TCKind current_member_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2731,14 +3063,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameValuePairSeq * get_members (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2749,14 +3086,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2767,36 +3109,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynValue (void);
-    
     virtual ~DynValue (void);
+    
+    friend class _TAO_DynValue_Remote_Proxy_Impl;
+    friend class _TAO_DynValue_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynValue_Direct_Proxy_Impl;
   
   private:
     DynValue (const DynValue &);
     void operator= (const DynValue &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY___PTR_CH_)
 #define _DYNAMICANY_DYNANYFACTORY___PTR_CH_
   
   class DynAnyFactory;
   typedef DynAnyFactory *DynAnyFactory_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY___VAR_CH_)
 #define _DYNAMICANY_DYNANYFACTORY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynAnyFactory_var : public TAO_Base_var
   {
   public:
@@ -2836,13 +3188,14 @@ TAO_NAMESPACE  DynamicAny
     DynAnyFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY___OUT_CH_)
 #define _DYNAMICANY_DYNANYFACTORY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynAnyFactory_out
   {
   public:
@@ -2859,11 +3212,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynAnyFactory_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_CH_
   
@@ -2871,11 +3225,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynAnyFactory_ptr _ptr_type;
     typedef DynAnyFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2897,6 +3248,10 @@ TAO_NAMESPACE  DynamicAny
       }
     
     
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
     
@@ -2909,7 +3264,7 @@ TAO_NAMESPACE  DynamicAny
       ~InconsistentTypeCode (void);
 
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-
+      
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2927,12 +3282,15 @@ TAO_NAMESPACE  DynamicAny
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr create_dyn_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2942,6 +3300,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
         CORBA::TypeCode_ptr type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2951,45 +3312,49 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynAnyFactory (void);
-    
     virtual ~DynAnyFactory (void);
+    
+    friend class _TAO_DynAnyFactory_Remote_Proxy_Impl;
+    friend class _TAO_DynAnyFactory_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynAnyFactory_Direct_Proxy_Impl;
   
   private:
     DynAnyFactory (const DynAnyFactory &);
     void operator= (const DynAnyFactory &);
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module DynamicAny
 
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, const DynamicAny::NameValuePair &); // copying version
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, DynamicAny::NameValuePair*); // noncopying version
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, DynamicAny::NameValuePair *&); // deprecated
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, const DynamicAny::NameValuePair *&);
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, const DynamicAny::NameValuePairSeq &); // copying version
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, DynamicAny::NameValuePairSeq*); // noncopying version
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, DynamicAny::NameValuePairSeq *&); // deprecated
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, const DynamicAny::NameValuePairSeq *&);
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, const DynamicAny::AnySeq &); // copying version
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, DynamicAny::AnySeq*); // noncopying version
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, DynamicAny::AnySeq *&); // deprecated
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, const DynamicAny::AnySeq *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_DynamicAny_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const DynamicAny::NameValuePair &);
 TAO_DynamicAny_Export CORBA::Boolean operator>> (TAO_InputCDR &, DynamicAny::NameValuePair &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
 #define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
 
@@ -3004,6 +3369,8 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_DynamicAny_AnySeq_H_
 #define _TAO_CDR_OP_DynamicAny_AnySeq_H_
@@ -3019,9 +3386,13 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "DynamicAnyC.i"
@@ -3037,3 +3408,4 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index c8d57c489fa..c317e10a441 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -19,41 +19,61 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception DynamicAny::DynAny::InvalidValue
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception DynamicAny::DynAny::TypeMismatch
-// *************************************************************
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNANY___CI_)
 #define _DYNAMICANY_DYNANY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynAny::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNFIXED___CI_)
 #define _DYNAMICANY_DYNFIXED___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNENUM___CI_)
 #define _DYNAMICANY_DYNENUM___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePair_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (void) // default constructor
+DynamicAny::NameValuePair_var::NameValuePair_var (void)
   : ptr_ (0)
 {}
 
@@ -63,42 +83,52 @@ DynamicAny::NameValuePair_var::NameValuePair_var (NameValuePair *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (const ::DynamicAny::NameValuePair_var &p) // copy constructor
+DynamicAny::NameValuePair_var::NameValuePair_var (const ::DynamicAny::NameValuePair_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameValuePair (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameValuePair (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::~NameValuePair_var (void) // destructor
+DynamicAny::NameValuePair_var::~NameValuePair_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePair_var &
-DynamicAny::NameValuePair_var::operator= (NameValuePair *p)
+ACE_INLINE
+DynamicAny::NameValuePair_var &
+DynamicAny::NameValuePair_var::operator= (NameValuePair *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePair_var &
-DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var &p)
+ACE_INLINE
+::DynamicAny::NameValuePair_var &
+DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          NameValuePair *deep_copy =
-            new NameValuePair (*p.ptr_);
+          NameValuePair *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameValuePair (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -143,7 +173,7 @@ DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const //
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast 
 {
@@ -162,7 +192,7 @@ DynamicAny::NameValuePair_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::DynamicAny::NameValuePair *&
 DynamicAny::NameValuePair_var::out (void)
 {
@@ -185,6 +215,9 @@ DynamicAny::NameValuePair_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePair_out
 // *************************************************************
@@ -197,7 +230,7 @@ DynamicAny::NameValuePair_out::NameValuePair_out (::DynamicAny::NameValuePair *&
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p) // constructor from _var
+DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -205,21 +238,23 @@ DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p) // const
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (const ::DynamicAny::NameValuePair_out &p) // copy constructor
+DynamicAny::NameValuePair_out::NameValuePair_out (const ::DynamicAny::NameValuePair_out &p)
   : ptr_ (ACE_const_cast (NameValuePair_out&, p).ptr_)
 {}
 
-ACE_INLINE DynamicAny::NameValuePair_out &
+ACE_INLINE
+DynamicAny::NameValuePair_out &
 DynamicAny::NameValuePair_out::operator= (const ::DynamicAny::NameValuePair_out &p)
 {
   this->ptr_ = ACE_const_cast (NameValuePair_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE DynamicAny::NameValuePair_out &
-DynamicAny::NameValuePair_out::operator= (NameValuePair *p)
+ACE_INLINE
+DynamicAny::NameValuePair_out &
+DynamicAny::NameValuePair_out::operator= (NameValuePair *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -241,192 +276,231 @@ DynamicAny::NameValuePair_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
 
-// = Static operations.
-ACE_INLINE DynamicAny::NameValuePair *
+ACE_INLINE
+DynamicAny::NameValuePair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   DynamicAny::NameValuePair *retval = 0;
   ACE_NEW_RETURN (retval, DynamicAny::NameValuePair[size], 0);
   return retval;
 }
 
-ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer)
-// Free the sequence.
+ACE_INLINE
+void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Default constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  DynamicAny::NameValuePair *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    DynamicAny::NameValuePair *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs)
-// Copy constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    DynamicAny::NameValuePair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_);
-    DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      DynamicAny::NameValuePair *tmp1 =
+        _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_);
+      DynamicAny::NameValuePair * const tmp2 =
+        ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          DynamicAny::NameValuePair *tmp =
+            ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  DynamicAny::NameValuePair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-  DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
+  DynamicAny::NameValuePair *tmp1 =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
+  DynamicAny::NameValuePair * const tmp2 =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE DynamicAny::NameValuePair &
+ACE_INLINE
+DynamicAny::NameValuePair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameValuePair* tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
+  DynamicAny::NameValuePair* tmp =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const DynamicAny::NameValuePair &
+ACE_INLINE
+const DynamicAny::NameValuePair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameValuePair * const tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_);
+  DynamicAny::NameValuePair * const tmp =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE DynamicAny::NameValuePair *
+ACE_INLINE
+DynamicAny::NameValuePair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (CORBA::Boolean orphan)
 {
   DynamicAny::NameValuePair *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const DynamicAny::NameValuePair *
+ACE_INLINE
+const DynamicAny::NameValuePair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-DynamicAny::NameValuePair *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameValuePair *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-  }
+    {
+      DynamicAny::NameValuePair *tmp =
+        ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
+      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePairSeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (void) // default constructor
+DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -436,21 +510,26 @@ DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (NameValuePairSeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (const ::DynamicAny::NameValuePairSeq_var &p) // copy constructor
+DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (const ::DynamicAny::NameValuePairSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameValuePairSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameValuePairSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::~NameValuePairSeq_var (void) // destructor
+DynamicAny::NameValuePairSeq_var::~NameValuePairSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePairSeq_var &
+ACE_INLINE
+DynamicAny::NameValuePairSeq_var &
 DynamicAny::NameValuePairSeq_var::operator= (NameValuePairSeq *p)
 {
   delete this->ptr_;
@@ -458,7 +537,8 @@ DynamicAny::NameValuePairSeq_var::operator= (NameValuePairSeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq_var &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq_var &
 DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSeq_var &p)
 {
   if (this != &p)
@@ -470,8 +550,12 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
         }
       else
         {
-          NameValuePairSeq *deep_copy =
-            new NameValuePairSeq (*p.ptr_);
+          NameValuePairSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameValuePairSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -486,69 +570,75 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+const ::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator const ::DynamicAny::NameValuePairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePair &
+ACE_INLINE
+DynamicAny::NameValuePair &
 DynamicAny::NameValuePairSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const DynamicAny::NameValuePair &
+ACE_INLINE
+const DynamicAny::NameValuePair &
 DynamicAny::NameValuePairSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const DynamicAny::NameValuePair &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::DynamicAny::NameValuePairSeq &
+ACE_INLINE
+const ::DynamicAny::NameValuePairSeq &
 DynamicAny::NameValuePairSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq &
 DynamicAny::NameValuePairSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *&
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *&
 DynamicAny::NameValuePairSeq_var::out (void)
 {
   delete this->ptr_;
@@ -556,7 +646,8 @@ DynamicAny::NameValuePairSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::_retn (void)
 {
   ::DynamicAny::NameValuePairSeq *tmp = this->ptr_;
@@ -564,12 +655,16 @@ DynamicAny::NameValuePairSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePairSeq_out
 // *************************************************************
@@ -582,7 +677,7 @@ DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p) // constructor from _var
+DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -590,57 +685,64 @@ DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p)
 }
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (const ::DynamicAny::NameValuePairSeq_out &p) // copy constructor
+DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (const ::DynamicAny::NameValuePairSeq_out &p)
   : ptr_ (ACE_const_cast (NameValuePairSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq_out &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq_out &
 DynamicAny::NameValuePairSeq_out::operator= (const ::DynamicAny::NameValuePairSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (NameValuePairSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq_out &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq_out &
 DynamicAny::NameValuePairSeq_out::operator= (NameValuePairSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_out::operator ::DynamicAny::NameValuePairSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *&
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *&
 DynamicAny::NameValuePairSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePair &
+ACE_INLINE
+DynamicAny::NameValuePair &
 DynamicAny::NameValuePairSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPair_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (void) // default constructor
+DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (void)
   : ptr_ (0)
 {}
 
@@ -650,42 +752,52 @@ DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (NameDynAnyPair *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (const ::DynamicAny::NameDynAnyPair_var &p) // copy constructor
+DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (const ::DynamicAny::NameDynAnyPair_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPair (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPair (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::~NameDynAnyPair_var (void) // destructor
+DynamicAny::NameDynAnyPair_var::~NameDynAnyPair_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair_var &
-DynamicAny::NameDynAnyPair_var::operator= (NameDynAnyPair *p)
+ACE_INLINE
+DynamicAny::NameDynAnyPair_var &
+DynamicAny::NameDynAnyPair_var::operator= (NameDynAnyPair *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPair_var &
-DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_var &p)
+ACE_INLINE
+::DynamicAny::NameDynAnyPair_var &
+DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          NameDynAnyPair *deep_copy =
-            new NameDynAnyPair (*p.ptr_);
+          NameDynAnyPair *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameDynAnyPair (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -730,7 +842,7 @@ DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast 
 {
@@ -749,7 +861,7 @@ DynamicAny::NameDynAnyPair_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::DynamicAny::NameDynAnyPair *&
 DynamicAny::NameDynAnyPair_var::out (void)
 {
@@ -772,6 +884,9 @@ DynamicAny::NameDynAnyPair_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPair_out
 // *************************************************************
@@ -784,7 +899,7 @@ DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (::DynamicAny::NameDynAnyPair
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p) // constructor from _var
+DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -792,21 +907,23 @@ DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p) // co
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (const ::DynamicAny::NameDynAnyPair_out &p) // copy constructor
+DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (const ::DynamicAny::NameDynAnyPair_out &p)
   : ptr_ (ACE_const_cast (NameDynAnyPair_out&, p).ptr_)
 {}
 
-ACE_INLINE DynamicAny::NameDynAnyPair_out &
+ACE_INLINE
+DynamicAny::NameDynAnyPair_out &
 DynamicAny::NameDynAnyPair_out::operator= (const ::DynamicAny::NameDynAnyPair_out &p)
 {
   this->ptr_ = ACE_const_cast (NameDynAnyPair_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair_out &
-DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *p)
+ACE_INLINE
+DynamicAny::NameDynAnyPair_out &
+DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -828,192 +945,231 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
 
-// = Static operations.
-ACE_INLINE DynamicAny::NameDynAnyPair *
+ACE_INLINE
+DynamicAny::NameDynAnyPair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   DynamicAny::NameDynAnyPair *retval = 0;
   ACE_NEW_RETURN (retval, DynamicAny::NameDynAnyPair[size], 0);
   return retval;
 }
 
-ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer)
-// Free the sequence.
+ACE_INLINE
+void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Default constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  DynamicAny::NameDynAnyPair *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    DynamicAny::NameDynAnyPair *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs)
-// Copy constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    DynamicAny::NameDynAnyPair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_);
-    DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      DynamicAny::NameDynAnyPair *tmp1 =
+        _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_);
+      DynamicAny::NameDynAnyPair * const tmp2 =
+        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          DynamicAny::NameDynAnyPair *tmp =
+            ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  DynamicAny::NameDynAnyPair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-  DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
+  DynamicAny::NameDynAnyPair *tmp1 =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
+  DynamicAny::NameDynAnyPair * const tmp2 =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE DynamicAny::NameDynAnyPair &
+ACE_INLINE
+DynamicAny::NameDynAnyPair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameDynAnyPair* tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
+  DynamicAny::NameDynAnyPair* tmp =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const DynamicAny::NameDynAnyPair &
+ACE_INLINE
+const DynamicAny::NameDynAnyPair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameDynAnyPair * const tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_);
+  DynamicAny::NameDynAnyPair * const tmp =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE DynamicAny::NameDynAnyPair *
+ACE_INLINE
+DynamicAny::NameDynAnyPair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (CORBA::Boolean orphan)
 {
   DynamicAny::NameDynAnyPair *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const DynamicAny::NameDynAnyPair *
+ACE_INLINE
+const DynamicAny::NameDynAnyPair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-DynamicAny::NameDynAnyPair *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameDynAnyPair *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-  }
+    {
+      DynamicAny::NameDynAnyPair *tmp =
+        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
+      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPairSeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (void) // default constructor
+DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1023,21 +1179,26 @@ DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (NameDynAnyPairSeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (const ::DynamicAny::NameDynAnyPairSeq_var &p) // copy constructor
+DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (const ::DynamicAny::NameDynAnyPairSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPairSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPairSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::~NameDynAnyPairSeq_var (void) // destructor
+DynamicAny::NameDynAnyPairSeq_var::~NameDynAnyPairSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPairSeq_var &
+ACE_INLINE
+DynamicAny::NameDynAnyPairSeq_var &
 DynamicAny::NameDynAnyPairSeq_var::operator= (NameDynAnyPairSeq *p)
 {
   delete this->ptr_;
@@ -1045,7 +1206,8 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (NameDynAnyPairSeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_var &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq_var &
 DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPairSeq_var &p)
 {
   if (this != &p)
@@ -1057,8 +1219,12 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
         }
       else
         {
-          NameDynAnyPairSeq *deep_copy =
-            new NameDynAnyPairSeq (*p.ptr_);
+          NameDynAnyPairSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameDynAnyPairSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1073,69 +1239,75 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+const ::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator const ::DynamicAny::NameDynAnyPairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair &
+ACE_INLINE
+DynamicAny::NameDynAnyPair &
 DynamicAny::NameDynAnyPairSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const DynamicAny::NameDynAnyPair &
+ACE_INLINE
+const DynamicAny::NameDynAnyPair &
 DynamicAny::NameDynAnyPairSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const DynamicAny::NameDynAnyPair &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::DynamicAny::NameDynAnyPairSeq &
+ACE_INLINE
+const ::DynamicAny::NameDynAnyPairSeq &
 DynamicAny::NameDynAnyPairSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq &
 DynamicAny::NameDynAnyPairSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *&
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *&
 DynamicAny::NameDynAnyPairSeq_var::out (void)
 {
   delete this->ptr_;
@@ -1143,7 +1315,8 @@ DynamicAny::NameDynAnyPairSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::_retn (void)
 {
   ::DynamicAny::NameDynAnyPairSeq *tmp = this->ptr_;
@@ -1151,12 +1324,16 @@ DynamicAny::NameDynAnyPairSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPairSeq_out
 // *************************************************************
@@ -1169,7 +1346,7 @@ DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var &p) // constructor from _var
+DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1177,251 +1354,310 @@ DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (const ::DynamicAny::NameDynAnyPairSeq_out &p) // copy constructor
+DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (const ::DynamicAny::NameDynAnyPairSeq_out &p)
   : ptr_ (ACE_const_cast (NameDynAnyPairSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_out &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq_out &
 DynamicAny::NameDynAnyPairSeq_out::operator= (const ::DynamicAny::NameDynAnyPairSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (NameDynAnyPairSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_out &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq_out &
 DynamicAny::NameDynAnyPairSeq_out::operator= (NameDynAnyPairSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_out::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *&
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *&
 DynamicAny::NameDynAnyPairSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair &
+ACE_INLINE
+DynamicAny::NameDynAnyPair &
 DynamicAny::NameDynAnyPairSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNSTRUCT___CI_)
 #define _DYNAMICANY_DYNSTRUCT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNUNION___CI_)
 #define _DYNAMICANY_DYNUNION___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_
 
-// = Static operations.
-ACE_INLINE CORBA::Any *
+ACE_INLINE
+CORBA::Any *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   CORBA::Any *retval = 0;
   ACE_NEW_RETURN (retval, CORBA::Any[size], 0);
   return retval;
 }
 
-ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer)
-// Free the sequence.
+ACE_INLINE
+void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Default constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::Any *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Any *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs)
-// Copy constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (
+    const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::Any *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_);
-    CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::Any *tmp1 =
+        _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_);
+      CORBA::Any * const tmp2 =
+        ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs)
-// Assignment operator.
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq &
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (
+    const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::Any *tmp =
+            ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-  CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
+  CORBA::Any *tmp1 =
+    ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
+  CORBA::Any * const tmp2 =
+    ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE CORBA::Any &
+ACE_INLINE
+CORBA::Any &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
+  CORBA::Any* tmp =
+    ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const CORBA::Any &
+ACE_INLINE
+const CORBA::Any &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
+  CORBA::Any * const tmp =
+    ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE CORBA::Any *
+ACE_INLINE
+CORBA::Any *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::Any *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::Any *
+ACE_INLINE
+const CORBA::Any *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Any * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-CORBA::Any *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Any *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    CORBA::Any *tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-  }
+    {
+      CORBA::Any *tmp =
+        ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
+      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_ANYSEQ_CI_)
 #define _DYNAMICANY_ANYSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::AnySeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (void) // default constructor
+DynamicAny::AnySeq_var::AnySeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1431,21 +1667,26 @@ DynamicAny::AnySeq_var::AnySeq_var (AnySeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (const ::DynamicAny::AnySeq_var &p) // copy constructor
+DynamicAny::AnySeq_var::AnySeq_var (const ::DynamicAny::AnySeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::AnySeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::AnySeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::AnySeq_var::~AnySeq_var (void) // destructor
+DynamicAny::AnySeq_var::~AnySeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::AnySeq_var &
+ACE_INLINE
+DynamicAny::AnySeq_var &
 DynamicAny::AnySeq_var::operator= (AnySeq *p)
 {
   delete this->ptr_;
@@ -1453,7 +1694,8 @@ DynamicAny::AnySeq_var::operator= (AnySeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq_var &
+ACE_INLINE
+::DynamicAny::AnySeq_var &
 DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
 {
   if (this != &p)
@@ -1465,8 +1707,12 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
         }
       else
         {
-          AnySeq *deep_copy =
-            new AnySeq (*p.ptr_);
+          AnySeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              AnySeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1481,69 +1727,75 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::AnySeq *
+ACE_INLINE
+const ::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator const ::DynamicAny::AnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Any &
+ACE_INLINE
+CORBA::Any &
 DynamicAny::AnySeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Any &
+ACE_INLINE
+const CORBA::Any &
 DynamicAny::AnySeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::Any &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::DynamicAny::AnySeq &
+ACE_INLINE
+const ::DynamicAny::AnySeq &
 DynamicAny::AnySeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq &
+ACE_INLINE
+::DynamicAny::AnySeq &
 DynamicAny::AnySeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::AnySeq *&
+ACE_INLINE
+::DynamicAny::AnySeq *&
 DynamicAny::AnySeq_var::out (void)
 {
   delete this->ptr_;
@@ -1551,7 +1803,8 @@ DynamicAny::AnySeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::_retn (void)
 {
   ::DynamicAny::AnySeq *tmp = this->ptr_;
@@ -1559,12 +1812,16 @@ DynamicAny::AnySeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::AnySeq_out
 // *************************************************************
@@ -1577,7 +1834,7 @@ DynamicAny::AnySeq_out::AnySeq_out (AnySeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p) // constructor from _var
+DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1585,58 +1842,65 @@ DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p) // constructor from _var
 }
 
 ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (const ::DynamicAny::AnySeq_out &p) // copy constructor
+DynamicAny::AnySeq_out::AnySeq_out (const ::DynamicAny::AnySeq_out &p)
   : ptr_ (ACE_const_cast (AnySeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::AnySeq_out &
+ACE_INLINE
+::DynamicAny::AnySeq_out &
 DynamicAny::AnySeq_out::operator= (const ::DynamicAny::AnySeq_out &p)
 {
   this->ptr_ = ACE_const_cast (AnySeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq_out &
+ACE_INLINE
+::DynamicAny::AnySeq_out &
 DynamicAny::AnySeq_out::operator= (AnySeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_out::operator ::DynamicAny::AnySeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *&
+ACE_INLINE
+::DynamicAny::AnySeq *&
 DynamicAny::AnySeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Any &
+ACE_INLINE
+CORBA::Any &
 DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_
 
-ACE_INLINE DynamicAny::DynAny **
+ACE_INLINE
+DynamicAny::DynAny **
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA::ULong nelems)
 {
   DynamicAny::DynAny **buf = 0;
@@ -1651,11 +1915,15 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (DynamicAny::DynAny **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -1671,64 +1939,83 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  DynamicAny::DynAny* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    DynamicAny::DynAny* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs)
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(
+    const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    DynamicAny::DynAny **tmp1 = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
-    DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      DynamicAny::DynAny **tmp1 =
+        _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
+      DynamicAny::DynAny ** const tmp2 =
+        ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs)
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = DynamicAny::DynAny::_nil ();
+      DynamicAny::DynAny **tmp =
+        ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = DynamicAny::DynAny::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  DynamicAny::DynAny **tmp1 = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-  DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
+  DynamicAny::DynAny **tmp1 =
+    ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
+  
+  DynamicAny::DynAny ** const tmp2 =
+    ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -1738,70 +2025,78 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (cons
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
+ACE_INLINE
+TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  DynamicAny::DynAny ** const tmp = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
+  DynamicAny::DynAny ** const tmp =
+    ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE DynamicAny::DynAny* *
+ACE_INLINE
+DynamicAny::DynAny* *
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (CORBA::Boolean orphan)
 {
   DynamicAny::DynAny **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const DynamicAny::DynAny* *
+ACE_INLINE
+const DynamicAny::DynAny* *
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CI_)
 #define _DYNAMICANY_DYNANYSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::DynAnySeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (void) // default constructor
+DynamicAny::DynAnySeq_var::DynAnySeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1811,21 +2106,26 @@ DynamicAny::DynAnySeq_var::DynAnySeq_var (DynAnySeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (const ::DynamicAny::DynAnySeq_var &p) // copy constructor
+DynamicAny::DynAnySeq_var::DynAnySeq_var (const ::DynamicAny::DynAnySeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::DynAnySeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::DynAnySeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::DynAnySeq_var::~DynAnySeq_var (void) // destructor
+DynamicAny::DynAnySeq_var::~DynAnySeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::DynAnySeq_var &
+ACE_INLINE
+DynamicAny::DynAnySeq_var &
 DynamicAny::DynAnySeq_var::operator= (DynAnySeq *p)
 {
   delete this->ptr_;
@@ -1833,7 +2133,8 @@ DynamicAny::DynAnySeq_var::operator= (DynAnySeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq_var &
+ACE_INLINE
+::DynamicAny::DynAnySeq_var &
 DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
 {
   if (this != &p)
@@ -1845,8 +2146,12 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
         }
       else
         {
-          DynAnySeq *deep_copy =
-            new DynAnySeq (*p.ptr_);
+          DynAnySeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              DynAnySeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1861,63 +2166,68 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::DynAnySeq *
+ACE_INLINE
+const ::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator const ::DynamicAny::DynAnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
+ACE_INLINE
+TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
 DynamicAny::DynAnySeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::DynamicAny::DynAnySeq &
+ACE_INLINE
+const ::DynamicAny::DynAnySeq &
 DynamicAny::DynAnySeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq &
+ACE_INLINE
+::DynamicAny::DynAnySeq &
 DynamicAny::DynAnySeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::DynAnySeq *&
+ACE_INLINE
+::DynamicAny::DynAnySeq *&
 DynamicAny::DynAnySeq_var::out (void)
 {
   delete this->ptr_;
@@ -1925,7 +2235,8 @@ DynamicAny::DynAnySeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::_retn (void)
 {
   ::DynamicAny::DynAnySeq *tmp = this->ptr_;
@@ -1933,12 +2244,16 @@ DynamicAny::DynAnySeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::DynAnySeq_out
 // *************************************************************
@@ -1951,7 +2266,7 @@ DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p) // constructor from _var
+DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1959,107 +2274,158 @@ DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p) // constructor from
 }
 
 ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (const ::DynamicAny::DynAnySeq_out &p) // copy constructor
+DynamicAny::DynAnySeq_out::DynAnySeq_out (const ::DynamicAny::DynAnySeq_out &p)
   : ptr_ (ACE_const_cast (DynAnySeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::DynAnySeq_out &
+ACE_INLINE
+::DynamicAny::DynAnySeq_out &
 DynamicAny::DynAnySeq_out::operator= (const ::DynamicAny::DynAnySeq_out &p)
 {
   this->ptr_ = ACE_const_cast (DynAnySeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq_out &
+ACE_INLINE
+::DynamicAny::DynAnySeq_out &
 DynamicAny::DynAnySeq_out::operator= (DynAnySeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_out::operator ::DynamicAny::DynAnySeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *&
+ACE_INLINE
+::DynamicAny::DynAnySeq *&
 DynamicAny::DynAnySeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
+ACE_INLINE
+TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
 DynamicAny::DynAnySeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE___CI_)
 #define _DYNAMICANY_DYNSEQUENCE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNARRAY___CI_)
 #define _DYNAMICANY_DYNARRAY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynArray::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNVALUE___CI_)
 #define _DYNAMICANY_DYNVALUE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynValue::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception DynamicAny::DynAnyFactory::InconsistentTypeCode
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY___CI_)
 #define _DYNAMICANY_DYNANYFACTORY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const DynamicAny::NameValuePair &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const DynamicAny::NameValuePair &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.id.in ()) &&
     (strm << _tao_aggregate.value)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, DynamicAny::NameValuePair &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    DynamicAny::NameValuePair &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.id.out ()) &&
     (strm >> _tao_aggregate.value)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_I_
 #define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_I_
@@ -2068,6 +2434,7 @@ CORBA::Boolean TAO_DynamicAny_Export operator<< (
     TAO_OutputCDR &,
     const DynamicAny::NameValuePairSeq &
   );
+
 CORBA::Boolean TAO_DynamicAny_Export operator>> (
     TAO_InputCDR &,
     DynamicAny::NameValuePairSeq &
@@ -2075,6 +2442,8 @@ CORBA::Boolean TAO_DynamicAny_Export operator>> (
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_DynamicAny_AnySeq_I_
 #define _TAO_CDR_OP_DynamicAny_AnySeq_I_
@@ -2083,6 +2452,7 @@ CORBA::Boolean TAO_DynamicAny_Export operator<< (
     TAO_OutputCDR &,
     const DynamicAny::AnySeq &
   );
+
 CORBA::Boolean TAO_DynamicAny_Export operator>> (
     TAO_InputCDR &,
     DynamicAny::AnySeq &
diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile
index e9b18105653..a1b2ec89672 100644
--- a/TAO/tao/DynamicAny/Makefile
+++ b/TAO/tao/DynamicAny/Makefile
@@ -136,7 +136,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -165,7 +166,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -201,7 +203,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -225,8 +236,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -236,10 +256,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -255,16 +277,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -341,7 +358,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -370,7 +388,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -406,7 +425,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -430,8 +458,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -441,10 +478,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -460,16 +499,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -555,7 +589,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -584,7 +619,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -620,7 +656,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -644,8 +689,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -655,10 +709,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -674,16 +730,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -769,7 +820,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -798,7 +850,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -834,7 +887,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -858,8 +920,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -869,10 +940,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -888,16 +961,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -974,7 +1042,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1003,7 +1072,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1039,7 +1109,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1063,8 +1142,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1074,10 +1162,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1093,16 +1183,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1122,9 +1207,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
 .obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
@@ -1188,7 +1271,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1217,7 +1301,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1253,7 +1338,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1277,8 +1371,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1288,10 +1391,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1307,16 +1412,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1336,9 +1436,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
 .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h $(ACE_ROOT)/ace/pre.h \
   DynamicAny.h dynamicany_export.h \
@@ -1402,7 +1500,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1431,7 +1530,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1467,7 +1567,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1491,8 +1600,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1502,10 +1620,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1521,16 +1641,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1614,7 +1729,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1643,7 +1759,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1679,7 +1796,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1703,8 +1829,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1714,10 +1849,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1733,16 +1870,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1762,9 +1894,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
 .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
@@ -1828,7 +1958,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1857,7 +1988,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1893,7 +2025,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1917,8 +2058,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1928,10 +2078,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1947,16 +2099,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1969,8 +2116,7 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i DynamicAnyC.i \
-  DynCommon.h DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  DynCommon.h DynAnyFactory.h
 
 .obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \
   $(ACE_ROOT)/ace/pre.h dynamicany_export.h \
@@ -2034,7 +2180,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2063,7 +2210,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2099,7 +2247,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2123,8 +2280,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -2134,10 +2300,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -2153,16 +2321,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2182,9 +2345,10 @@ endif
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -2215,14 +2379,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2268,6 +2424,28 @@ endif
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
index f262c8125d2..8ca6443aad9 100644
--- a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
+++ b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
@@ -161,6 +161,7 @@ SOURCE=.\DynamicAny.cpp
 # Begin Source File

 

 SOURCE=.\DynamicAnyC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File