ChangeLogTag: Fri Mar 28 19:12:40 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

23 files changed, 1355 insertions, 6942 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e71724b3ed6..28663e2b453 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,42 @@
+Fri Mar 28 19:12:40 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CONV_FRAMEC.cpp:
+        * CONV_FRAMEC.h:
+        * CONV_FRAMEC.i:
+        * CurrentC.cpp:
+        * CurrentC.h:
+        * CurrentC.i:
+        * DomainC.cpp:
+        * DomainC.h:
+        * DomainC.i:
+        * DynamicC.cpp:
+        * DynamicC.h:
+        * DynamicC.i:
+        * GIOPC.cpp:
+        * GIOPC.h:
+        * GIOPC.i:
+        * IIOPC.cpp:
+        * IIOPC.h:
+        * IIOPC.i:
+
+ 	  Regenerated some hand-crafted files.
+
+        * corbafwd.h:
+
+	  Removed some forward _var and _out declarations.
+	  Since these are now typedefs, they can't be forward
+	  declared.
+
+        * Seq_VarOut_T.inl:
+
+	  Fixed a typo.
+
+        * GIOP.pidl:
+        * IOP.pidl:
+
+	  Modified these to use CORBA::OctetSeq instead of
+	  regenerating each time.
+
 Fri Mar 28 17:09:30 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * AbstractBase.cpp:
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index c353e9d5f13..6f2d05a514f 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -23,7 +23,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-#include "tao/CONV_FRAMEC.h"
+#include "CONV_FRAMEC.h"
 #include "tao/Any_T.h"
 
 #if defined (__BORLANDC__)
@@ -161,7 +161,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -170,125 +170,54 @@ void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
+template class
+  TAO_Unbounded_Sequence<
+      CONV_FRAME::CodeSetId
+    >;
 
-void
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ULong* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old =
-        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ULong *tmp =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Unbounded_Sequence< \
+      CONV_FRAME::CodeSetId \
+    >
 
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
-// *************************************************************
-
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void)
-{}
-
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
+template class
+  TAO_Var_Var_T<
+      CodeSetComponent
+    >;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+template class
+  TAO_Out_T<
+      CodeSetComponent,
+      CodeSetComponent_var
+    >;
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      CodeSetComponent \
+    >
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) // dtor
-{}
+# pragma instantiate \
+  TAO_Out_T< \
+      CodeSetComponent, \
+      CodeSetComponent_var \
+    >
 
-void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void *_tao_void_pointer)
-{
-  _tao_seq_CodeSetId *tmp = ACE_static_cast (_tao_seq_CodeSetId*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -411,7 +340,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -420,6 +349,37 @@ void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_poin
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      CodeSetComponentInfo
+    >;
+
+template class
+  TAO_Out_T<
+      CodeSetComponentInfo,
+      CodeSetComponentInfo_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      CodeSetComponentInfo \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      CodeSetComponentInfo, \
+      CodeSetComponentInfo_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
@@ -494,7 +454,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -502,6 +462,25 @@ void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      CodeSetContext
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      CodeSetContext \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -698,7 +677,7 @@ CORBA::Boolean operator>>= (
 #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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
 #define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 345c281055d..fc285ae928d 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -28,6 +28,7 @@
 #include "ace/pre.h"
 #include "tao/CDR.h"
 #include "tao/Sequence.h"
+#include "tao/VarOut_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -64,7 +65,7 @@ TAO_NAMESPACE  CONV_FRAME
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
@@ -75,9 +76,25 @@ TAO_NAMESPACE  CONV_FRAME
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class CodeSetComponent_var;
+  struct CodeSetComponent;
+  
+  typedef
+    TAO_Var_Var_T<
+        CodeSetComponent
+      >
+    CodeSetComponent_var;
+  
+  typedef
+    TAO_Out_T<
+        CodeSetComponent,
+        CodeSetComponent_var
+      >
+    CodeSetComponent_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export CodeSetComponent
   {
@@ -87,101 +104,14 @@ TAO_NAMESPACE  CONV_FRAME
     CONV_FRAME::CodeSetId native_code_set;
     
     
-    // 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_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-    
-    class TAO_Export _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void);
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-          const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-        );
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &operator= (
-          const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void);
-      
-      // = Accessors.
-      CORBA::ULong &operator[] (CORBA::ULong i);
-      const CORBA::ULong &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static CORBA::ULong *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::ULong *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::ULong *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
-    class _tao_seq_CodeSetId;
-    
-    // *************************************************************
-    // CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
-    // *************************************************************
-    
-    class TAO_Export _tao_seq_CodeSetId : 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_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    {
-    public:
-      _tao_seq_CodeSetId (void);
-      _tao_seq_CodeSetId (CORBA::ULong max);
-      _tao_seq_CodeSetId (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          CORBA::ULong *buffer, 
-          CORBA::Boolean release = 0
-        );
-      _tao_seq_CodeSetId (const _tao_seq_CodeSetId &);
-      ~_tao_seq_CodeSetId (void);
-      
-      static void _tao_any_destructor (void*);
-      
-      
-    };
-
-#endif /* end #if !defined */
+    typedef
+      TAO_Unbounded_Sequence<
+          CONV_FRAME::CodeSetId
+        >
+      _tao_seq_CodeSetId;
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
@@ -191,69 +121,30 @@ TAO_NAMESPACE  CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export CodeSetComponent_var
-  {
-  public:
-    CodeSetComponent_var (void);
-    CodeSetComponent_var (CodeSetComponent *);
-    CodeSetComponent_var (const CodeSetComponent_var &);
-    ~CodeSetComponent_var (void);
-    
-    CodeSetComponent_var &operator= (CodeSetComponent *);
-    CodeSetComponent_var &operator= (const CodeSetComponent_var &);
-    CodeSetComponent *operator-> (void);
-    const CodeSetComponent *operator-> (void) const;
-    
-    operator const CodeSetComponent &() const;
-    operator CodeSetComponent &();
-    operator CodeSetComponent &() const;
-    
-    // Variable-size types only.
-    operator CodeSetComponent *&();
-    
-    // in, inout, out, _retn 
-    const CodeSetComponent &in (void) const;
-    CodeSetComponent &inout (void);
-    CodeSetComponent *&out (void);
-    CodeSetComponent *_retn (void);
-    CodeSetComponent *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    CodeSetComponent *ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class TAO_Export CodeSetComponent_out
-  {
-  public:
-    CodeSetComponent_out (CodeSetComponent *&);
-    CodeSetComponent_out (CodeSetComponent_var &);
-    CodeSetComponent_out (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (CodeSetComponent *);
-    operator CodeSetComponent *&();
-    CodeSetComponent *&ptr (void);
-    CodeSetComponent *operator-> (void);
-    
-  private:
-    CodeSetComponent *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const CodeSetComponent_var &);
-  };
+  struct CodeSetComponentInfo;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Var_Var_T<
+        CodeSetComponentInfo
+      >
+    CodeSetComponentInfo_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
+  typedef
+    TAO_Out_T<
+        CodeSetComponentInfo,
+        CodeSetComponentInfo_var
+      >
+    CodeSetComponentInfo_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class CodeSetComponentInfo_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export CodeSetComponentInfo
   {
@@ -265,69 +156,27 @@ TAO_NAMESPACE  CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export CodeSetComponentInfo_var
-  {
-  public:
-    CodeSetComponentInfo_var (void);
-    CodeSetComponentInfo_var (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &);
-    ~CodeSetComponentInfo_var (void);
-    
-    CodeSetComponentInfo_var &operator= (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var &operator= (const CodeSetComponentInfo_var &);
-    CodeSetComponentInfo *operator-> (void);
-    const CodeSetComponentInfo *operator-> (void) const;
-    
-    operator const CodeSetComponentInfo &() const;
-    operator CodeSetComponentInfo &();
-    operator CodeSetComponentInfo &() const;
-    
-    // Variable-size types only.
-    operator CodeSetComponentInfo *&();
-    
-    // in, inout, out, _retn 
-    const CodeSetComponentInfo &in (void) const;
-    CodeSetComponentInfo &inout (void);
-    CodeSetComponentInfo *&out (void);
-    CodeSetComponentInfo *_retn (void);
-    CodeSetComponentInfo *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    CodeSetComponentInfo *ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class TAO_Export CodeSetComponentInfo_out
-  {
-  public:
-    CodeSetComponentInfo_out (CodeSetComponentInfo *&);
-    CodeSetComponentInfo_out (CodeSetComponentInfo_var &);
-    CodeSetComponentInfo_out (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (CodeSetComponentInfo *);
-    operator CodeSetComponentInfo *&();
-    CodeSetComponentInfo *&ptr (void);
-    CodeSetComponentInfo *operator-> (void);
-    
-  private:
-    CodeSetComponentInfo *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const CodeSetComponentInfo_var &);
-  };
+  struct CodeSetContext;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Fixed_Var_T<
+        CodeSetContext
+      >
+    CodeSetContext_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
+  typedef
+    CodeSetContext &
+    CodeSetContext_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class CodeSetContext_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export CodeSetContext
   {
@@ -339,48 +188,6 @@ TAO_NAMESPACE  CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export CodeSetContext_var
-  {
-  public:
-    CodeSetContext_var (void);
-    CodeSetContext_var (CodeSetContext *);
-    CodeSetContext_var (const CodeSetContext_var &);
-    // Fixed-size types only.
-    CodeSetContext_var (const CodeSetContext &);
-    ~CodeSetContext_var (void);
-    
-    CodeSetContext_var &operator= (CodeSetContext *);
-    CodeSetContext_var &operator= (const CodeSetContext_var &);
-    
-    // Fixed-size types only.
-    CodeSetContext_var &operator= (const CodeSetContext &);
-    
-    CodeSetContext *operator-> (void);
-    const CodeSetContext *operator-> (void) const;
-    
-    operator const CodeSetContext &() const;
-    operator CodeSetContext &();
-    operator CodeSetContext &() const;
-    
-    // in, inout, out, _retn 
-    const CodeSetContext &in (void) const;
-    CodeSetContext &inout (void);
-    CodeSetContext &out (void);
-    CodeSetContext _retn (void);
-    CodeSetContext *ptr (void) const;
-  
-  private:
-    CodeSetContext *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef CodeSetContext &CodeSetContext_out;
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
@@ -427,7 +234,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_
 #define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_
@@ -461,7 +268,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "CONV_FRAMEC.i"
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
index bb3d8ef82c6..1414e6641dc 100644
--- a/TAO/tao/CONV_FRAMEC.i
+++ b/TAO/tao/CONV_FRAMEC.i
@@ -21,804 +21,6 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CodeSetComponent *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const ::CONV_FRAME::CodeSetComponent_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponent (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (CodeSetComponent *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (const ::CONV_FRAME::CodeSetComponent_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CodeSetComponent *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              CodeSetComponent (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              CodeSetComponent *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator const ::CONV_FRAME::CodeSetComponent &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::_retn (void)
-{
-  ::CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_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 CONV_FRAME::CodeSetComponent_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (::CONV_FRAME::CodeSetComponent *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CodeSetComponent_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const ::CONV_FRAME::CodeSetComponent_out &p)
-  : ptr_ (ACE_const_cast (CodeSetComponent_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (const ::CONV_FRAME::CodeSetComponent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CodeSetComponent_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (CodeSetComponent *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CONV_FRAME::CodeSetComponent_out::operator ::CONV_FRAME::CodeSetComponent *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_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_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-ACE_INLINE
-CORBA::ULong *
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
-{
-  CORBA::ULong *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (CORBA::ULong *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
-{
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-    const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ULong *tmp1 =
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->maximum_);
-      CORBA::ULong * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ULong * 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;
-    }
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator= (
-    const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ULong *tmp =
-            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ULong *tmp1 =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  CORBA::ULong * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ULong &
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong* tmp =
-    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ULong &
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong * const tmp =
-    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ULong *
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ULong *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ULong*, 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::ULong*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ULong *
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp =
-        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CodeSetComponentInfo *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const ::CONV_FRAME::CodeSetComponentInfo_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponentInfo (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (CodeSetComponentInfo *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (const ::CONV_FRAME::CodeSetComponentInfo_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CodeSetComponentInfo *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              CodeSetComponentInfo (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              CodeSetComponentInfo *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator const ::CONV_FRAME::CodeSetComponentInfo &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::_retn (void)
-{
-  ::CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_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 CONV_FRAME::CodeSetComponentInfo_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (::CONV_FRAME::CodeSetComponentInfo *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CodeSetComponentInfo_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
-  : ptr_ (ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (CodeSetComponentInfo *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CONV_FRAME::CodeSetComponentInfo_out::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetContext_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CodeSetContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext &p)
-{
-  ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (p));
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (CodeSetContext *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CodeSetContext *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              CodeSetContext (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              CodeSetContext *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::CONV_FRAME::CodeSetContext (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator const ::CONV_FRAME::CodeSetContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext
-CONV_FRAME::CodeSetContext_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_
@@ -837,7 +39,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -878,7 +80,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -919,7 +121,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 8d5943f95ca..ad291a070a9 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -41,7 +41,7 @@
 int CORBA::Current::_tao_class_id = 0;
 
 CORBA::Current_ptr
-tao_CORBA_Current_duplicate (
+CORBA::tao_Current_life::tao_duplicate (
     CORBA::Current_ptr p
   )
 {
@@ -49,7 +49,7 @@ tao_CORBA_Current_duplicate (
 }
 
 void
-tao_CORBA_Current_release (
+CORBA::tao_Current_life::tao_release (
     CORBA::Current_ptr p
   )
 {
@@ -57,231 +57,67 @@ tao_CORBA_Current_release (
 }
 
 CORBA::Current_ptr
-tao_CORBA_Current_nil (
+CORBA::tao_Current_life::tao_nil (
     void
   )
 {
   return CORBA::Current::_nil ();
 }
 
-CORBA::Current_ptr
-tao_CORBA_Current_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_Current_upcast (
-    void *src
-  )
-{
-  CORBA::Current **tmp =
-    ACE_static_cast (CORBA::Current **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_Current_marshal (
+CORBA::tao_Current_life::tao_marshal (
     CORBA::Current_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::Current_var
-// *************************************************************
-
-CORBA::Current_var::Current_var (void)
-  : ptr_ (Current::_nil ())
-{}
-
-::CORBA::Current_ptr
-CORBA::Current_var::ptr (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-CORBA::Current_var::Current_var (const ::CORBA::Current_var &p)
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-CORBA::Current_var::~Current_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::Current_var &
-CORBA::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Current_var &
-CORBA::Current_var::operator= (const ::CORBA::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::Current_var::operator const ::CORBA::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::Current_var::operator ::CORBA::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr &
-CORBA::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr &
-CORBA::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Current::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Current_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Current::_nil ();
-  return val;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::tao_duplicate (Current_ptr p)
-{
-  return ::CORBA::Current::_duplicate (p);
-}
-
-void
-CORBA::Current_var::tao_release (Current_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::tao_nil (void)
-{
-  return ::CORBA::Current::_nil ();
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::tao_narrow (
+CORBA::Current_ptr
+CORBA::tao_Current_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::Current_var::tao_upcast (void *src)
+CORBA::tao_Current_cast::tao_upcast (
+    void *src
+  )
 {
-  Current **tmp =
-    ACE_static_cast (Current **, src);
+  CORBA::Current **tmp =
+    ACE_static_cast (CORBA::Current **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::Current_out
-// *************************************************************
-
-CORBA::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Current::_nil ();
-}
-
-CORBA::Current_out::Current_out (Current_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Current::_nil ();
-}
-
-CORBA::Current_out::Current_out (const ::CORBA::Current_out &p)
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-::CORBA::Current_out &
-CORBA::Current_out::operator= (const ::CORBA::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::Current_out &
-CORBA::Current_out::operator= (const ::CORBA::Current_var &p)
-{
-  this->ptr_ = ::CORBA::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::Current_out &
-CORBA::Current_out::operator= (Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Current_out::operator ::CORBA::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr &
-CORBA::Current_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::Current,
+        CORBA::tao_Current_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::Current,
+        CORBA::tao_Current_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::Current, \
+        CORBA::tao_Current_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::Current, \
+        CORBA::tao_Current_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Current::Current (void)
 {}
@@ -375,6 +211,12 @@ const char* CORBA::Current::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Current:1.0";
 }
 
+CORBA::Boolean
+CORBA::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index bb7416ffd9b..288c1332001 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -59,90 +59,47 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-namespace CORBA
-{
-#if !defined (_CORBA_CURRENT___PTR_CH_)
-#define _CORBA_CURRENT___PTR_CH_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
+TAO_NAMESPACE  CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
+  
   class Current;
   typedef Current *Current_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CURRENT___VAR_CH_)
-#define _CORBA_CURRENT___VAR_CH_
-
-  class TAO_Export Current_var : public TAO_Base_var
+  struct tao_Current_life;
+  typedef TAO_Objref_Var_T<Current, tao_Current_life> Current_var;
+  typedef TAO_Objref_Out_T<Current, tao_Current_life> Current_out;
+  
+  struct tao_Current_life
   {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (
-                                         CORBA::Object *
-                                         ACE_ENV_ARG_DECL_NOT_USED
-                                         );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    Current_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Current_var (const TAO_Base_var &rhs);
-    Current_var &operator= (const TAO_Base_var &rhs);
+    static CORBA::Boolean tao_marshal (
+        Current_ptr,
+        TAO_OutputCDR &
+      );
   };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CURRENT___OUT_CH_)
-#define _CORBA_CURRENT___OUT_CH_
-
-  class TAO_Export Current_out
+  
+  struct tao_Current_cast
   {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (const Current_out &);
-    Current_out &operator= (const Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-
-  private:
-    Current_ptr &ptr_;
+    static Current_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
-
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual CORBA::Object
   {
@@ -150,47 +107,56 @@ namespace CORBA
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     Current (void);
     virtual ~Current (void);
-
+  
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
-
 #endif /* end #if !defined */
-}  // End namespace CORBA 
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
@@ -210,7 +176,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &)
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "CurrentC.i"
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index 9cb6f83b66b..69108b75c12 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -26,12 +26,5 @@
 #if !defined (_CORBA_CURRENT___CI_)
 #define _CORBA_CURRENT___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Current::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 287f5f2caa4..7edff95f4ce 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -74,6 +74,15 @@ CORBA::tao_DomainManager_life::tao_nil (
   return CORBA::DomainManager::_nil ();
 }
 
+CORBA::Boolean
+CORBA::tao_DomainManager_life::tao_marshal (
+    CORBA::DomainManager_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 CORBA::DomainManager_ptr
 CORBA::tao_DomainManager_cast::tao_narrow (
     CORBA::Object *p
@@ -93,194 +102,32 @@ CORBA::tao_DomainManager_cast::tao_upcast (
   return *tmp;
 }
 
-#if 0
-
-// *************************************************************
-// CORBA::DomainManager_var
-// *************************************************************
-
-CORBA::DomainManager_var::DomainManager_var (void)
-  : ptr_ (DomainManager::_nil ())
-{}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p)
-  : TAO_Base_var (),
-    ptr_ (DomainManager::_duplicate (p.ptr ()))
-{}
-
-CORBA::DomainManager_var::~DomainManager_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::DomainManager_var &
-CORBA::DomainManager_var::operator= (DomainManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::DomainManager_var &
-CORBA::DomainManager_var::operator= (const ::CORBA::DomainManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::DomainManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::DomainManager_var::operator const ::CORBA::DomainManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::DomainManager_var::operator ::CORBA::DomainManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr &
-CORBA::DomainManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr &
-CORBA::DomainManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::DomainManager_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-  return val;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::tao_duplicate (DomainManager_ptr p)
-{
-  return ::CORBA::DomainManager::_duplicate (p);
-}
-
-void
-CORBA::DomainManager_var::tao_release (DomainManager_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::tao_nil (void)
-{
-  return ::CORBA::DomainManager::_nil ();
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-CORBA::DomainManager_var::tao_upcast (void *src)
-{
-  DomainManager **tmp =
-    ACE_static_cast (DomainManager **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::DomainManager,
+        CORBA::tao_DomainManager_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::DomainManager,
+        CORBA::tao_DomainManager_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::DomainManager, \
+        CORBA::tao_DomainManager_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::DomainManager, \
+        CORBA::tao_DomainManager_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::DomainManager_out
-// *************************************************************
-
-CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-}
-
-CORBA::DomainManager_out::DomainManager_out (DomainManager_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-}
-
-CORBA::DomainManager_out::DomainManager_out (const ::CORBA::DomainManager_out &p)
-  : ptr_ (ACE_const_cast (DomainManager_out &, p).ptr_)
-{}
-
-::CORBA::DomainManager_out &
-CORBA::DomainManager_out::operator= (const ::CORBA::DomainManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (DomainManager_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::DomainManager_out &
-CORBA::DomainManager_out::operator= (const ::CORBA::DomainManager_var &p)
-{
-  this->ptr_ = ::CORBA::DomainManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::DomainManager_out &
-CORBA::DomainManager_out::operator= (DomainManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::DomainManager_out::operator ::CORBA::DomainManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr &
-CORBA::DomainManager_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#endif /* 0 */
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -316,7 +163,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
   TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -470,87 +317,91 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+              
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << policy_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+              
+              if (!(
+                  (_tao_out << policy_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+              
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+                  
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+                  
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                      
+                    }
+                  
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Policy_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+                  
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+                
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+            
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Policy_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -561,7 +412,7 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
             );
           ACE_TRY_CHECK;
           
-          PortableInterceptor::ReplyStatus _tao_status =
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -585,7 +436,7 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
             );
           ACE_TRY_CHECK;
           
-          PortableInterceptor::ReplyStatus _tao_status =
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -597,22 +448,20 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      PortableInterceptor::ReplyStatus _tao_status =
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+        
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+        
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
@@ -668,7 +517,7 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::DomainManager::DomainManager (int collocated)
 {
@@ -825,7 +674,7 @@ CORBA::DomainManager::_is_a (
     }
   else
     {
-      return this->Object::_is_a (
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -868,6 +717,12 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
+CORBA::Boolean
+CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -936,7 +791,7 @@ TAO_NAMESPACE_END
 int CORBA::ConstructionPolicy::_tao_class_id = 0;
 
 CORBA::ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_duplicate (
+CORBA::tao_ConstructionPolicy_life::tao_duplicate (
     CORBA::ConstructionPolicy_ptr p
   )
 {
@@ -944,7 +799,7 @@ tao_CORBA_ConstructionPolicy_duplicate (
 }
 
 void
-tao_CORBA_ConstructionPolicy_release (
+CORBA::tao_ConstructionPolicy_life::tao_release (
     CORBA::ConstructionPolicy_ptr p
   )
 {
@@ -952,228 +807,64 @@ tao_CORBA_ConstructionPolicy_release (
 }
 
 CORBA::ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_nil (
+CORBA::tao_ConstructionPolicy_life::tao_nil (
     void
   )
 {
   return CORBA::ConstructionPolicy::_nil ();
 }
 
-CORBA::ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ConstructionPolicy_upcast (
-    void *src
-  )
-{
-  CORBA::ConstructionPolicy **tmp =
-    ACE_static_cast (CORBA::ConstructionPolicy **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ConstructionPolicy_marshal (
+CORBA::tao_ConstructionPolicy_life::tao_marshal (
     CORBA::ConstructionPolicy_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ConstructionPolicy_var
-// *************************************************************
-
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void)
-  : ptr_ (ConstructionPolicy::_nil ())
-{}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ConstructionPolicy::_duplicate (p.ptr ()))
-{}
-
-CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ConstructionPolicy_var &
-CORBA::ConstructionPolicy_var::operator= (ConstructionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ConstructionPolicy_var &
-CORBA::ConstructionPolicy_var::operator= (const ::CORBA::ConstructionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ConstructionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ConstructionPolicy_var::operator const ::CORBA::ConstructionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ConstructionPolicy_var::operator ::CORBA::ConstructionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ConstructionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-  return val;
+  return p->marshal (cdr);
 }
 
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::tao_duplicate (ConstructionPolicy_ptr p)
-{
-  return ::CORBA::ConstructionPolicy::_duplicate (p);
-}
-
-void
-CORBA::ConstructionPolicy_var::tao_release (ConstructionPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::tao_nil (void)
-{
-  return ::CORBA::ConstructionPolicy::_nil ();
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::tao_narrow (
+CORBA::ConstructionPolicy_ptr
+CORBA::tao_ConstructionPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ConstructionPolicy_var::tao_upcast (void *src)
+CORBA::tao_ConstructionPolicy_cast::tao_upcast (
+    void *src
+  )
 {
-  ConstructionPolicy **tmp =
-    ACE_static_cast (ConstructionPolicy **, src);
+  CORBA::ConstructionPolicy **tmp =
+    ACE_static_cast (CORBA::ConstructionPolicy **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ConstructionPolicy_out
-// *************************************************************
-
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-}
-
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-}
-
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (const ::CORBA::ConstructionPolicy_out &p)
-  : ptr_ (ACE_const_cast (ConstructionPolicy_out &, p).ptr_)
-{}
-
-::CORBA::ConstructionPolicy_out &
-CORBA::ConstructionPolicy_out::operator= (const ::CORBA::ConstructionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConstructionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ConstructionPolicy_out &
-CORBA::ConstructionPolicy_out::operator= (const ::CORBA::ConstructionPolicy_var &p)
-{
-  this->ptr_ = ::CORBA::ConstructionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ConstructionPolicy_out &
-CORBA::ConstructionPolicy_out::operator= (ConstructionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ConstructionPolicy_out::operator ::CORBA::ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ConstructionPolicy,
+        CORBA::tao_ConstructionPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ConstructionPolicy,
+        CORBA::tao_ConstructionPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ConstructionPolicy, \
+        CORBA::tao_ConstructionPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ConstructionPolicy, \
+        CORBA::tao_ConstructionPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -1210,7 +901,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
   TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -1378,67 +1069,73 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+              
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
-
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (adapter->interfacedef_cdr_insert (_tao_out, object_type)) &&
-              (_tao_out << CORBA::Any::from_boolean (constr_policy))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+              
+              if (!(
+                  (adapter->interfacedef_cdr_insert (_tao_out, object_type)) &&
+                  (_tao_out << CORBA::Any::from_boolean (constr_policy))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+              
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+                  
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+                
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+            
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1449,7 +1146,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             );
           ACE_TRY_CHECK;
           
-          PortableInterceptor::ReplyStatus _tao_status =
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1473,7 +1170,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             );
           ACE_TRY_CHECK;
           
-          PortableInterceptor::ReplyStatus _tao_status =
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1485,19 +1182,17 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      PortableInterceptor::ReplyStatus _tao_status =
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+        
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+        
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -1554,7 +1249,7 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ConstructionPolicy::ConstructionPolicy (int collocated)
 {
@@ -1717,7 +1412,7 @@ CORBA::ConstructionPolicy::_is_a (
     }
   else
     {
-      return this->Object::_is_a (
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1774,6 +1469,12 @@ const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
+CORBA::Boolean
+CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -1841,295 +1542,202 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// 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)
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Unbounded_Object_Sequence<
+      CORBA::DomainManager,
+      CORBA::DomainManager_var,
+      CORBA::tao_DomainManager_life,
+      CORBA::tao_DomainManager_cast
+    >;
+
+
+template class
+  TAO_VarSeq_Var_T<
+      CORBA::DomainManagerList,
+      TAO_Object_Manager<
+          CORBA::DomainManager,
+          CORBA::DomainManager_var,
+          CORBA::tao_DomainManager_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::DomainManagerList,
+      CORBA::DomainManagerList_var,
+      TAO_Object_Manager<
+          CORBA::DomainManager,
+          CORBA::DomainManager_var,
+          CORBA::tao_DomainManager_life
+        >
+    >;
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::DomainManager **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
+# pragma instantiate \
+    TAO_Unbounded_Object_Sequence< \
+        CORBA::DomainManager, \
+        CORBA::DomainManager_var, \
+        CORBA::tao_DomainManager_life, \
+        CORBA::tao_DomainManager_cast, \
+      >
+
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        CORBA::DomainManagerList, \
+        TAO_Object_Manager< \
+            CORBA::DomainManager, \
+            CORBA::DomainManager_var, \
+            CORBA::tao_DomainManager_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::DomainManagerList, \
+        CORBA::DomainManagerList_var, \
+        TAO_Object_Manager< \
+            CORBA::DomainManager, \
+            CORBA::DomainManager_var, \
+            CORBA::tao_DomainManager_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
   
-  if (this->buffer_ != 0)
-    {
-      CORBA::DomainManager **old = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::DomainManager::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
   
-  this->buffer_ = tmp;
-}
+  static const CORBA::Long _oc_CORBA_DomainManagerList[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f446f), 
+    ACE_NTOHL (0x6d61696e), 
+    ACE_NTOHL (0x4d616e61), 
+    ACE_NTOHL (0x6765724c), 
+    ACE_NTOHL (0x6973743a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
+        18,
+    ACE_NTOHL (0x446f6d61), 
+    ACE_NTOHL (0x696e4d61), 
+    ACE_NTOHL (0x6e616765), 
+    ACE_NTOHL (0x724c6973), 
+    ACE_NTOHL (0x74000000),  // name = DomainManagerList
+        CORBA::tk_sequence, // typecode kind
+    80, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_objref, // typecode kind
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        36,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f446f), 
+        ACE_NTOHL (0x6d61696e), 
+        ACE_NTOHL (0x4d616e61), 
+        ACE_NTOHL (0x6765723a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
+                14,
+        ACE_NTOHL (0x446f6d61), 
+        ACE_NTOHL (0x696e4d61), 
+        ACE_NTOHL (0x6e616765), 
+        ACE_NTOHL (0x72000000),  // name = DomainManager
+        
+      0U,
 
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
+};
   
-  CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
+      CORBA::tk_alias,
+      sizeof (_oc_CORBA_DomainManagerList),
+      (char *) &_oc_CORBA_DomainManagerList,
+      0,
+      sizeof (CORBA::DomainManagerList)
+    );
   
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::DomainManager::_nil ();
-    }
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_DomainManagerList,
+      &_tc_TAO_tc_CORBA_DomainManagerList
+    )
+  TAO_NAMESPACE_END
   
-  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
   
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::DomainManager::_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::DomainManager **tmp = ACE_static_cast (CORBA::DomainManager**, target);
-  *tmp = CORBA::DomainManager::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const
-{
-  CORBA::DomainManager **tmp = ACE_static_cast (CORBA::DomainManager**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if 0
-
-// *************************************************************
-// CORBA::DomainManagerList
-// *************************************************************
-
-CORBA::DomainManagerList::DomainManagerList (void)
-{}
-
-CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::DomainManagerList::DomainManagerList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::DomainManager_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::DomainManagerList::~DomainManagerList (void) // dtor
-{}
-
-void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DomainManagerList *tmp = ACE_static_cast (DomainManagerList*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* 0 */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_DomainManagerList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765724c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
-    18,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x74000000),  // name = DomainManagerList
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f446f), 
-      ACE_NTOHL (0x6d61696e), 
-      ACE_NTOHL (0x4d616e61), 
-      ACE_NTOHL (0x6765723a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-            14,
-      ACE_NTOHL (0x446f6d61), 
-      ACE_NTOHL (0x696e4d61), 
-      ACE_NTOHL (0x6e616765), 
-      ACE_NTOHL (0x72000000),  // name = DomainManager
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_DomainManagerList),
-    (char *) &_oc_CORBA_DomainManagerList,
-    0,
-    sizeof (CORBA::DomainManagerList)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_DomainManagerList,
-    &_tc_TAO_tc_CORBA_DomainManagerList
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr _tao_elem
-  )
-{
-  CORBA::DomainManager_ptr _tao_objptr =
-    CORBA::DomainManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
-      _tao_any,
-      CORBA::DomainManager::_tao_any_destructor,
-      CORBA::_tc_DomainManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
+  // Copying insertion.
+  void
+  operator<<= (
+      CORBA::Any &_tao_any,
+      CORBA::DomainManager_ptr _tao_elem
+    )
+  {
+    CORBA::DomainManager_ptr _tao_objptr =
+      CORBA::DomainManager::_duplicate (_tao_elem);
+    _tao_any <<= &_tao_objptr;
+  }
+  
+  // Non-copying insertion.
+  void
+  operator<<= (
+      CORBA::Any &_tao_any,
+      CORBA::DomainManager_ptr *_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<CORBA::DomainManager>::insert (
         _tao_any,
         CORBA::DomainManager::_tao_any_destructor,
         CORBA::_tc_DomainManager,
-        _tao_elem
+        *_tao_elem
       );
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::DomainManager>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
-  template class TAO::Any_Impl_T<CORBA::DomainManager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
-# pragma instantiate TAO::Any_Impl_T<CORBA::DomainManager>
+  }
+  
+  CORBA::Boolean
+  operator>>= (
+      const CORBA::Any &_tao_any,
+      CORBA::DomainManager_ptr &_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<CORBA::DomainManager>::extract (
+          _tao_any,
+          CORBA::DomainManager::_tao_any_destructor,
+          CORBA::_tc_DomainManager,
+          _tao_elem
+        );
+  }
+  
+  template<>
+  CORBA::Boolean
+  TAO::Any_Impl_T<CORBA::DomainManager>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return 1;
+  }
+  
+  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+      defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
+    template class TAO::Any_Impl_T<CORBA::DomainManager>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
+  # pragma instantiate TAO::Any_Impl_T<CORBA::DomainManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -2254,8 +1862,15 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2298,7 +1913,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2341,7 +1956,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 91cc784362b..388710b1f75 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -26,12 +26,16 @@
 #define _TAO_IDL_ORIG_DOMAINC_H_
 
 #include "ace/pre.h"
+
 #include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "tao/corbafwd.h"
+
 #include "PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -64,112 +68,36 @@ TAO_NAMESPACE  CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_DOMAINMANAGER___PTR_CH_)
-#define _CORBA_DOMAINMANAGER___PTR_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
   
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-
-#endif /* end #if !defined */
+  struct tao_DomainManager_life;
+  typedef TAO_Objref_Var_T<DomainManager, tao_DomainManager_life> DomainManager_var;
+  typedef TAO_Objref_Out_T<DomainManager, tao_DomainManager_life> DomainManager_out;
   
-    struct tao_DomainManager_life;
-    typedef TAO_Objref_Var_T<DomainManager, tao_DomainManager_life> DomainManager_var;
-    typedef TAO_Objref_Out_T<DomainManager, tao_DomainManager_life> DomainManager_out;
-
-    struct tao_DomainManager_life
-    {
-      static DomainManager_ptr tao_duplicate (DomainManager_ptr);
-      static void tao_release (DomainManager_ptr);
-      static DomainManager_ptr tao_nil (void);
-    };
-
-    struct tao_DomainManager_cast
-    {
-      static DomainManager_ptr tao_narrow (CORBA::Object_ptr
-                                 ACE_ENV_ARG_DECL);
-      static CORBA::Object_ptr tao_upcast (void *);
-    };
-
-#if 0
-  
-#if !defined (_CORBA_DOMAINMANAGER___VAR_CH_)
-#define _CORBA_DOMAINMANAGER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export DomainManager_var : public TAO_Base_var
+  struct tao_DomainManager_life
   {
-  public:
-    DomainManager_var (void); // default constructor
-    DomainManager_var (DomainManager_ptr p) : ptr_ (p) {} 
-    DomainManager_var (const DomainManager_var &); // copy constructor
-    ~DomainManager_var (void); // destructor
-    
-    DomainManager_var &operator= (DomainManager_ptr);
-    DomainManager_var &operator= (const DomainManager_var &);
-    DomainManager_ptr operator-> (void) const;
-    
-    operator const DomainManager_ptr &() const;
-    operator DomainManager_ptr &();
-    // in, inout, out, _retn 
-    DomainManager_ptr in (void) const;
-    DomainManager_ptr &inout (void);
-    DomainManager_ptr &out (void);
-    DomainManager_ptr _retn (void);
-    DomainManager_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DomainManager_ptr tao_duplicate (DomainManager_ptr);
     static void tao_release (DomainManager_ptr);
     static DomainManager_ptr tao_nil (void);
-    static DomainManager_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DomainManager_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DomainManager_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DomainManager_var (const TAO_Base_var &rhs);
-    DomainManager_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DOMAINMANAGER___OUT_CH_)
-#define _CORBA_DOMAINMANAGER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export DomainManager_out
+  struct tao_DomainManager_cast
   {
-  public:
-    DomainManager_out (DomainManager_ptr &);
-    DomainManager_out (DomainManager_var &);
-    DomainManager_out (const DomainManager_out &);
-    DomainManager_out &operator= (const DomainManager_out &);
-    DomainManager_out &operator= (const DomainManager_var &);
-    DomainManager_out &operator= (DomainManager_ptr);
-    operator DomainManager_ptr &();
-    DomainManager_ptr &ptr (void);
-    DomainManager_ptr operator-> (void);
-  
-  private:
-    DomainManager_ptr &ptr_;
+    static DomainManager_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
-
-#endif /* end #if !defined */
-
-#endif /* 0 */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
@@ -219,7 +147,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -403,93 +331,39 @@ TAO_NAMESPACE  CORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong SecConstruction = 11U;
+  const CORBA::PolicyType SecConstruction = 11U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___PTR_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
   
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  struct tao_ConstructionPolicy_life;
+  typedef TAO_Objref_Var_T<ConstructionPolicy, tao_ConstructionPolicy_life> ConstructionPolicy_var;
+  typedef TAO_Objref_Out_T<ConstructionPolicy, tao_ConstructionPolicy_life> ConstructionPolicy_out;
   
-  class TAO_Export ConstructionPolicy_var : public TAO_Base_var
+  struct tao_ConstructionPolicy_life
   {
-  public:
-    ConstructionPolicy_var (void); // default constructor
-    ConstructionPolicy_var (ConstructionPolicy_ptr p) : ptr_ (p) {} 
-    ConstructionPolicy_var (const ConstructionPolicy_var &); // copy constructor
-    ~ConstructionPolicy_var (void); // destructor
-    
-    ConstructionPolicy_var &operator= (ConstructionPolicy_ptr);
-    ConstructionPolicy_var &operator= (const ConstructionPolicy_var &);
-    ConstructionPolicy_ptr operator-> (void) const;
-    
-    operator const ConstructionPolicy_ptr &() const;
-    operator ConstructionPolicy_ptr &();
-    // in, inout, out, _retn 
-    ConstructionPolicy_ptr in (void) const;
-    ConstructionPolicy_ptr &inout (void);
-    ConstructionPolicy_ptr &out (void);
-    ConstructionPolicy_ptr _retn (void);
-    ConstructionPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ConstructionPolicy_ptr tao_duplicate (ConstructionPolicy_ptr);
     static void tao_release (ConstructionPolicy_ptr);
     static ConstructionPolicy_ptr tao_nil (void);
-    static ConstructionPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ConstructionPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ConstructionPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConstructionPolicy_var (const TAO_Base_var &rhs);
-    ConstructionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export ConstructionPolicy_out
+  struct tao_ConstructionPolicy_cast
   {
-  public:
-    ConstructionPolicy_out (ConstructionPolicy_ptr &);
-    ConstructionPolicy_out (ConstructionPolicy_var &);
-    ConstructionPolicy_out (const ConstructionPolicy_out &);
-    ConstructionPolicy_out &operator= (const ConstructionPolicy_out &);
-    ConstructionPolicy_out &operator= (const ConstructionPolicy_var &);
-    ConstructionPolicy_out &operator= (ConstructionPolicy_ptr);
-    operator ConstructionPolicy_ptr &();
-    ConstructionPolicy_ptr &ptr (void);
-    ConstructionPolicy_ptr operator-> (void);
-  
-  private:
-    ConstructionPolicy_ptr &ptr_;
+    static ConstructionPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
@@ -540,7 +414,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -724,184 +598,37 @@ TAO_NAMESPACE  CORBA
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy;
   
-#if 0
-  
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        DomainManager* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
-        const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static DomainManager **allocbuf (CORBA::ULong nelems);
-    static void freebuf (DomainManager **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    DomainManager* *get_buffer (CORBA::Boolean orphan = 0);
-    const DomainManager* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    virtual CORBA::Object* _upcast (void *src) const;
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
-#define _CORBA_DOMAINMANAGERLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class DomainManagerList;
-  class DomainManagerList_var;
-  
-  // *************************************************************
-  // CORBA::DomainManagerList
-  // *************************************************************
-  
-  class TAO_Export DomainManagerList : 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_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<DomainManager,DomainManager_var,tao_DomainManager_life,tao_DomainManager_cast>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    DomainManagerList (void);
-    DomainManagerList (CORBA::ULong max);
-    DomainManagerList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        DomainManager_ptr *buffer, 
-        CORBA::Boolean release = 0
-      );
-    DomainManagerList (const DomainManagerList &);
-    ~DomainManagerList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef DomainManagerList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-#endif /* 0 */
-
-  typedef TAO_Unbounded_Object_Sequence<DomainManager,
-                                        DomainManager_var,
-                                        tao_DomainManager_life,
-                                        tao_DomainManager_cast>
-    DomainManagerList;
-  
-#if !defined (_CORBA_DOMAINMANAGERLIST___VAR_CH_)
-#define _CORBA_DOMAINMANAGERLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::DomainManagerList_var
-  // *************************************************************
-  
-  class TAO_Export DomainManagerList_var
-  {
-  public:
-    DomainManagerList_var (void);
-    DomainManagerList_var (DomainManagerList *);
-    DomainManagerList_var (const DomainManagerList_var &);
-    ~DomainManagerList_var (void);
-    
-    DomainManagerList_var &operator= (DomainManagerList *);
-    DomainManagerList_var &operator= (const DomainManagerList_var &);
-    DomainManagerList *operator-> (void);
-    const DomainManagerList *operator-> (void) const;
-    
-    operator const DomainManagerList &() const;
-    operator DomainManagerList &();
-    operator DomainManagerList &() const;
-    
-    // Variable-size base types only.
-    operator DomainManagerList *&();
-    
-    TAO_Object_Manager<DomainManager,DomainManager_var,tao_DomainManager_life> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const DomainManagerList &in (void) const;
-    DomainManagerList &inout (void);
-    DomainManagerList *&out (void);
-    DomainManagerList *_retn (void);
-    DomainManagerList *ptr (void) const;
-  
-  private:
-    DomainManagerList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DOMAINMANAGERLIST___OUT_CH_)
-#define _CORBA_DOMAINMANAGERLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export DomainManagerList_out
-  {
-  public:
-    DomainManagerList_out (DomainManagerList *&);
-    DomainManagerList_out (DomainManagerList_var &);
-    DomainManagerList_out (const DomainManagerList_out &);
-    DomainManagerList_out &operator= (const DomainManagerList_out &);
-    DomainManagerList_out &operator= (DomainManagerList *);
-    operator DomainManagerList *&();
-    DomainManagerList *&ptr (void);
-    DomainManagerList *operator-> (void);
-    TAO_Object_Manager<DomainManager,DomainManager_var,tao_DomainManager_life> operator[] (CORBA::ULong index);
-  
-  private:
-    DomainManagerList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const DomainManagerList_var &);
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  
+  typedef
+    TAO_Unbounded_Object_Sequence<
+        CORBA::DomainManager,
+        CORBA::DomainManager_var,
+        CORBA::tao_DomainManager_life,
+        CORBA::tao_DomainManager_cast
+      > DomainManagerList;
+  
+  typedef
+    TAO_VarSeq_Var_T<
+        DomainManagerList,
+        TAO_Object_Manager<
+            CORBA::DomainManager,
+            CORBA::DomainManager_var,
+            CORBA::tao_DomainManager_life
+          >
+      > DomainManagerList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        DomainManagerList,
+        DomainManagerList_var,
+        TAO_Object_Manager<
+            CORBA::DomainManager,
+            CORBA::DomainManager_var,
+            CORBA::tao_DomainManager_life
+          >
+      > DomainManagerList_out;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -971,7 +698,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Construction
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstructionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64
 
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_H_
@@ -993,7 +720,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "DomainC.i"
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index c4f59a86733..ff88cdfc9ab 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -32,18 +32,11 @@ CORBA::DomainManager::DomainManager (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : Object (objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
   this->CORBA_DomainManager_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -58,448 +51,11 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : Object (objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
   this->CORBA_ConstructionPolicy_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-#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_CORBA_DOMAINMANAGERLIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_
-
-ACE_INLINE
-CORBA::DomainManager **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::DomainManager **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::DomainManager*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::DomainManager::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA::DomainManager **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::DomainManager* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(
-    const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::DomainManager **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
-      CORBA::DomainManager ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::DomainManager **tmp =
-        ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::DomainManager::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::DomainManager **tmp1 =
-    ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
-  
-  CORBA::DomainManager ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::DomainManager ** const tmp =
-    ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::DomainManager* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::DomainManager **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::DomainManager**, 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::DomainManager**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::DomainManager* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_DOMAINMANAGERLIST_CI_)
-#define _CORBA_DOMAINMANAGERLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (DomainManagerList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::~DomainManagerList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var &
-CORBA::DomainManagerList_var::operator= (DomainManagerList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList_var &
-CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          DomainManagerList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              DomainManagerList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              DomainManagerList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::operator const ::CORBA::DomainManagerList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var, CORBA::tao_DomainManager_life>
-CORBA::DomainManagerList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::DomainManagerList &
-CORBA::DomainManagerList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList &
-CORBA::DomainManagerList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *&
-CORBA::DomainManagerList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::_retn (void)
-{
-  ::CORBA::DomainManagerList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_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 CORBA::DomainManagerList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p)
-  : ptr_ (ACE_const_cast (DomainManagerList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::DomainManagerList_out &
-CORBA::DomainManagerList_out::operator= (const ::CORBA::DomainManagerList_out &p)
-{
-  this->ptr_ = ACE_const_cast (DomainManagerList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList_out &
-CORBA::DomainManagerList_out::operator= (DomainManagerList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_out::operator ::CORBA::DomainManagerList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *&
-CORBA::DomainManagerList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var, CORBA::tao_DomainManager_life>
-CORBA::DomainManagerList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index ac87a5d034f..f8a3e7bd62d 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -126,7 +125,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -134,126 +133,81 @@ void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// 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_DYNAMIC_PARAMETERLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_
-
-void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_allocate_buffer (CORBA::ULong length)
-{
-  Dynamic::Parameter* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      Dynamic::Parameter *old =
-        ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  Dynamic::Parameter *tmp =
-    ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-  _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
-{
-  this->_deallocate_buffer ();
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+template class
+  TAO_Var_Var_T<
+      Parameter
+    >;
 
-#if !defined (_DYNAMIC_PARAMETERLIST_CS_)
-#define _DYNAMIC_PARAMETERLIST_CS_
+template class
+  TAO_Out_T<
+      Parameter,
+      Parameter_var
+    >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// *************************************************************
-// Dynamic::ParameterList
-// *************************************************************
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      Parameter \
+    >
 
-Dynamic::ParameterList::ParameterList (void)
-{}
+# pragma instantiate \
+  TAO_Out_T< \
+      Parameter, \
+      Parameter_var \
+    >
 
-Dynamic::ParameterList::ParameterList (CORBA::ULong max)
-  : 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Dynamic::Parameter>
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Dynamic::Parameter *buffer,
-    CORBA::Boolean release
-  )
-  : 
+template class
+  TAO_Unbounded_Sequence<
+      Dynamic::Parameter
+    >;
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Dynamic::Parameter>
+template class
+  TAO_VarSeq_Var_T<
+      ParameterList,
+      Dynamic::Parameter
+    >;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+template class
+  TAO_Seq_Out_T<
+      ParameterList,
+      ParameterList_var,
+      Dynamic::Parameter
+    >;
 
-Dynamic::ParameterList::ParameterList (const ParameterList &seq)
-  : 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Dynamic::Parameter>
+# pragma instantiate \
+  TAO_Unbounded_Sequence< \
+      Dynamic::Parameter \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ParameterList, \
+      Dynamic::Parameter \
+    >
 
-Dynamic::ParameterList::~ParameterList (void) // dtor
-{}
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ParameterList, \
+      ParameterList_var, \
+      Dynamic::Parameter \
+    >
 
-void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ParameterList *tmp = ACE_static_cast (ParameterList*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -465,153 +419,64 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// 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)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::TypeCode **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::TypeCode **old = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
-    }
-}
-
-
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
-#define _DYNAMIC_EXCEPTIONLIST_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// Dynamic::ExceptionList
-// *************************************************************
-
-Dynamic::ExceptionList::ExceptionList (void)
-{}
-
-Dynamic::ExceptionList::ExceptionList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-Dynamic::ExceptionList::ExceptionList (const ExceptionList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-Dynamic::ExceptionList::~ExceptionList (void) // dtor
-{}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Unbounded_Pseudo_Sequence<
+      Dynamic::TypeCode,
+      Dynamic::TypeCode_var
+    >;
+
+template class
+  TAO_VarSeq_Var_T<
+      Dynamic::ExceptionList,
+      TAO_Pseudo_Object_Manager<
+          Dynamic::TypeCode,
+          Dynamic::TypeCode_var
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      Dynamic::ExceptionList,
+      Dynamic::ExceptionList_var,
+      TAO_Pseudo_Object_Manager<
+          Dynamic::TypeCode,
+          Dynamic::TypeCode_var
+        >
+    >;
 
-void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExceptionList *tmp = ACE_static_cast (ExceptionList*, _tao_void_pointer);
-  delete tmp;
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Unbounded_Pseudo_Sequence< \
+      Dynamic::TypeCode, \
+      Dynamic::TypeCode_var \
+    >
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      Dynamic::ExceptionList, \
+      TAO_Pseudo_Object_Manager< \
+          Dynamic::TypeCode, \
+          Dynamic::TypeCode_var \
+        > \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      Dynamic::ExceptionList, \
+      Dynamic::ExceptionList_var, \
+      TAO_Pseudo_Object_Manager< \
+          Dynamic::TypeCode, \
+          Dynamic::TypeCode_var \
+        > \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -867,6 +732,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Dynamic::ParameterList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::ParameterList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -925,8 +797,15 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>
+#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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -992,7 +871,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 4e384bd664a..bce1640c6e8 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -36,6 +36,7 @@
 #include "tao/TAO_Export.h"
 #include "tao/Any_T.h"
 #include "tao/Sequence.h"
+#include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -67,9 +68,25 @@ TAO_NAMESPACE  Dynamic
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class Parameter_var;
+  struct Parameter;
+  
+  typedef
+    TAO_Var_Var_T<
+        Parameter
+      >
+    Parameter_var;
+  
+  typedef
+    TAO_Out_T<
+        Parameter,
+        Parameter_var
+      >
+    Parameter_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export Parameter
   {
@@ -81,234 +98,33 @@ TAO_NAMESPACE  Dynamic
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export Parameter_var
-  {
-  public:
-    Parameter_var (void);
-    Parameter_var (Parameter *);
-    Parameter_var (const Parameter_var &);
-    ~Parameter_var (void);
-    
-    Parameter_var &operator= (Parameter *);
-    Parameter_var &operator= (const Parameter_var &);
-    Parameter *operator-> (void);
-    const Parameter *operator-> (void) const;
-    
-    operator const Parameter &() const;
-    operator Parameter &();
-    operator Parameter &() const;
-    
-    // Variable-size types only.
-    operator Parameter *&();
-    
-    // in, inout, out, _retn 
-    const Parameter &in (void) const;
-    Parameter &inout (void);
-    Parameter *&out (void);
-    Parameter *_retn (void);
-    Parameter *ptr (void) const;
-  
-  private:
-    Parameter *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export Parameter_out
-  {
-  public:
-    Parameter_out (Parameter *&);
-    Parameter_out (Parameter_var &);
-    Parameter_out (const Parameter_out &);
-    Parameter_out &operator= (const Parameter_out &);
-    Parameter_out &operator= (Parameter *);
-    operator Parameter *&();
-    Parameter *&ptr (void);
-    Parameter *operator-> (void);
-    
-  private:
-    Parameter *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const Parameter_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
   
-  // 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_DYNAMIC_PARAMETERLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Sequence_Dynamic_ParameterList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Parameter *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (
-        const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-      );
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList &operator= (
-        const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
-    
-    // = Accessors.
-    Parameter &operator[] (CORBA::ULong i);
-    const Parameter &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static Parameter *allocbuf (CORBA::ULong size);
-    static void freebuf (Parameter *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Parameter *get_buffer (CORBA::Boolean orphan = 0);
-    const Parameter *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Parameter *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CH_)
-#define _DYNAMIC_PARAMETERLIST_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ParameterList;
-  class ParameterList_var;
-  
-  // *************************************************************
-  // Dynamic::ParameterList
-  // *************************************************************
-  
-  class TAO_Export ParameterList : 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_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Parameter>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    ParameterList (void);
-    ParameterList (CORBA::ULong max);
-    ParameterList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        Parameter *buffer, 
-        CORBA::Boolean release = 0
-      );
-    ParameterList (const ParameterList &);
-    ~ParameterList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ParameterList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_PARAMETERLIST___VAR_CH_)
-#define _DYNAMIC_PARAMETERLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class Dynamic::ParameterList_var
-  // *************************************************************
-  
-  class TAO_Export ParameterList_var
-  {
-  public:
-    ParameterList_var (void);
-    ParameterList_var (ParameterList *);
-    ParameterList_var (const ParameterList_var &);
-    ~ParameterList_var (void);
-    
-    ParameterList_var &operator= (ParameterList *);
-    ParameterList_var &operator= (const ParameterList_var &);
-    ParameterList *operator-> (void);
-    const ParameterList *operator-> (void) const;
-    
-    operator const ParameterList &() const;
-    operator ParameterList &();
-    operator ParameterList &() const;
-    
-    // Variable-size base types only.
-    operator ParameterList *&();
-    
-    Parameter & operator[] (CORBA::ULong index);
-    const Parameter & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ParameterList &in (void) const;
-    ParameterList &inout (void);
-    ParameterList *&out (void);
-    ParameterList *_retn (void);
-    ParameterList *ptr (void) const;
-  
-  private:
-    ParameterList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_PARAMETERLIST___OUT_CH_)
-#define _DYNAMIC_PARAMETERLIST___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ParameterList_out
-  {
-  public:
-    ParameterList_out (ParameterList *&);
-    ParameterList_out (ParameterList_var &);
-    ParameterList_out (const ParameterList_out &);
-    ParameterList_out &operator= (const ParameterList_out &);
-    ParameterList_out &operator= (ParameterList *);
-    operator ParameterList *&();
-    ParameterList *&ptr (void);
-    ParameterList *operator-> (void);
-    Parameter & operator[] (CORBA::ULong index);
-  
-  private:
-    ParameterList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ParameterList_var &);
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  
+  typedef
+    TAO_Unbounded_Sequence<
+        Dynamic::Parameter
+      >
+    ParameterList;
+  
+  typedef
+    TAO_VarSeq_Var_T<
+        ParameterList,
+        Dynamic::Parameter
+      >
+    ParameterList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ParameterList,
+        ParameterList_var,
+        Dynamic::Parameter
+      >
+    ParameterList_out;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -316,7 +132,7 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
   
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
@@ -328,7 +144,7 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::TypeCode TypeCode;
   typedef CORBA::TypeCode_ptr TypeCode_ptr;
@@ -341,170 +157,33 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCode;
   
   // 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_DYNAMIC_EXCEPTIONLIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA::TypeCode* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
-        const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &operator= (
-        const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
-    
-    // = Accessors.
-    TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static CORBA::TypeCode **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA::TypeCode **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA::TypeCode* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA::TypeCode* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
-#define _DYNAMIC_EXCEPTIONLIST_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ExceptionList;
-  class ExceptionList_var;
-  
-  // *************************************************************
-  // Dynamic::ExceptionList
-  // *************************************************************
-  
-  class TAO_Export ExceptionList : 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_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    ExceptionList (void);
-    ExceptionList (CORBA::ULong max);
-    ExceptionList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::TypeCode_ptr *buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExceptionList (const ExceptionList &);
-    ~ExceptionList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExceptionList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST___VAR_CH_)
-#define _DYNAMIC_EXCEPTIONLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class Dynamic::ExceptionList_var
-  // *************************************************************
-  
-  class TAO_Export ExceptionList_var
-  {
-  public:
-    ExceptionList_var (void);
-    ExceptionList_var (ExceptionList *);
-    ExceptionList_var (const ExceptionList_var &);
-    ~ExceptionList_var (void);
-    
-    ExceptionList_var &operator= (ExceptionList *);
-    ExceptionList_var &operator= (const ExceptionList_var &);
-    ExceptionList *operator-> (void);
-    const ExceptionList *operator-> (void) const;
-    
-    operator const ExceptionList &() const;
-    operator ExceptionList &();
-    operator ExceptionList &() const;
-    
-    // Variable-size base types only.
-    operator ExceptionList *&();
-    
-    TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExceptionList &in (void) const;
-    ExceptionList &inout (void);
-    ExceptionList *&out (void);
-    ExceptionList *_retn (void);
-    ExceptionList *ptr (void) const;
-  
-  private:
-    ExceptionList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST___OUT_CH_)
-#define _DYNAMIC_EXCEPTIONLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ExceptionList_out
-  {
-  public:
-    ExceptionList_out (ExceptionList *&);
-    ExceptionList_out (ExceptionList_var &);
-    ExceptionList_out (const ExceptionList_out &);
-    ExceptionList_out &operator= (const ExceptionList_out &);
-    ExceptionList_out &operator= (ExceptionList *);
-    operator ExceptionList *&();
-    ExceptionList *&ptr (void);
-    ExceptionList *operator-> (void);
-    TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExceptionList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExceptionList_var &);
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  
+  typedef
+    TAO_Unbounded_Pseudo_Sequence<
+        Dynamic::TypeCode,
+        Dynamic::TypeCode_var
+      >
+    ExceptionList;
+  
+  typedef
+    TAO_VarSeq_Var_T<
+        ExceptionList,
+        TAO_Pseudo_Object_Manager<
+            Dynamic::TypeCode,
+            Dynamic::TypeCode_var
+          >
+      > ExceptionList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ExceptionList,
+        ExceptionList_var,
+        TAO_Pseudo_Object_Manager<
+            Dynamic::TypeCode,
+            Dynamic::TypeCode_var
+          >
+      > ExceptionList_out;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -512,7 +191,7 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
   
   typedef CORBA::StringSeq RequestContext;
   typedef CORBA::StringSeq_var RequestContext_var;
@@ -565,7 +244,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64
 
 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
 #define _TAO_CDR_OP_Dynamic_ParameterList_H_
@@ -582,7 +261,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64
 
 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
 #define _TAO_CDR_OP_Dynamic_ExceptionList_H_
@@ -604,7 +283,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "DynamicC.i"
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index 323bbc4e31d..768188d6cad 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -21,1108 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class Dynamic::Parameter_var
-// *************************************************************
-
-ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (Parameter *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (const ::Dynamic::Parameter_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Dynamic::Parameter (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::~Parameter_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (Parameter *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Parameter *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Parameter (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Parameter *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::Dynamic::Parameter *
-Dynamic::Parameter_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::operator const ::Dynamic::Parameter &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::Dynamic::Parameter &
-Dynamic::Parameter_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter &
-Dynamic::Parameter_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::Dynamic::Parameter *&
-Dynamic::Parameter_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_var::_retn (void)
-{
-  ::Dynamic::Parameter *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_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 Dynamic::Parameter_out
-// *************************************************************
-
-ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (::Dynamic::Parameter *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (Parameter_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (const ::Dynamic::Parameter_out &p)
-  : ptr_ (ACE_const_cast (Parameter_out&, p).ptr_)
-{}
-
-ACE_INLINE
-Dynamic::Parameter_out &
-Dynamic::Parameter_out::operator= (const ::Dynamic::Parameter_out &p)
-{
-  this->ptr_ = ACE_const_cast (Parameter_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-Dynamic::Parameter_out &
-Dynamic::Parameter_out::operator= (Parameter *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-Dynamic::Parameter_out::operator ::Dynamic::Parameter *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *&
-Dynamic::Parameter_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_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_DYNAMIC_PARAMETERLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_
-
-ACE_INLINE
-Dynamic::Parameter *
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (CORBA::ULong size)
-{
-  Dynamic::Parameter *retval = 0;
-  ACE_NEW_RETURN (retval, Dynamic::Parameter[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (Dynamic::Parameter *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    Dynamic::Parameter *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (
-    const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      Dynamic::Parameter *tmp1 =
-        _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->maximum_);
-      Dynamic::Parameter * const tmp2 =
-        ACE_reinterpret_cast (Dynamic::Parameter * 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;
-    }
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator= (
-    const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          Dynamic::Parameter *tmp =
-            ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  Dynamic::Parameter *tmp1 =
-    ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-  Dynamic::Parameter * const tmp2 =
-    ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-Dynamic::Parameter &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter* tmp =
-    ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const Dynamic::Parameter &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter * const tmp =
-    ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-Dynamic::Parameter *
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (CORBA::Boolean orphan)
-{
-  Dynamic::Parameter *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const Dynamic::Parameter *
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const Dynamic::Parameter * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Dynamic::Parameter *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      Dynamic::Parameter *tmp =
-        ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CI_)
-#define _DYNAMIC_PARAMETERLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class Dynamic::ParameterList_var
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (ParameterList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (const ::Dynamic::ParameterList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Dynamic::ParameterList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::~ParameterList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var &
-Dynamic::ParameterList_var::operator= (ParameterList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList_var &
-Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ParameterList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ParameterList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ParameterList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::Dynamic::ParameterList *
-Dynamic::ParameterList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::operator const ::Dynamic::ParameterList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter &
-Dynamic::ParameterList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const Dynamic::Parameter &
-Dynamic::ParameterList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const Dynamic::Parameter &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::Dynamic::ParameterList &
-Dynamic::ParameterList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList &
-Dynamic::ParameterList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *&
-Dynamic::ParameterList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_var::_retn (void)
-{
-  ::Dynamic::ParameterList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_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 Dynamic::ParameterList_out
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (ParameterList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (const ::Dynamic::ParameterList_out &p)
-  : ptr_ (ACE_const_cast (ParameterList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::Dynamic::ParameterList_out &
-Dynamic::ParameterList_out::operator= (const ::Dynamic::ParameterList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ParameterList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList_out &
-Dynamic::ParameterList_out::operator= (ParameterList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_out::operator ::Dynamic::ParameterList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *&
-Dynamic::ParameterList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter &
-Dynamic::ParameterList_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_DYNAMIC_EXCEPTIONLIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_
-
-ACE_INLINE
-CORBA::TypeCode **
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::TypeCode **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::TypeCode*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::TypeCode::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (CORBA::TypeCode **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::TypeCode* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(
-    const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::TypeCode **tmp1 =
-        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-      CORBA::TypeCode ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (
-    const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::TypeCode **tmp =
-        ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::TypeCode::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::TypeCode **tmp1 =
-    ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-  
-  CORBA::TypeCode ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::TypeCode ** const tmp =
-    ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::TypeCode* *
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::TypeCode **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::TypeCode**, 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::TypeCode**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::TypeCode* *
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CI_)
-#define _DYNAMIC_EXCEPTIONLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class Dynamic::ExceptionList_var
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (ExceptionList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (const ::Dynamic::ExceptionList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::~ExceptionList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var &
-Dynamic::ExceptionList_var::operator= (ExceptionList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList_var &
-Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExceptionList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExceptionList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExceptionList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::operator const ::Dynamic::ExceptionList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-Dynamic::ExceptionList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::Dynamic::ExceptionList &
-Dynamic::ExceptionList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList &
-Dynamic::ExceptionList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *&
-Dynamic::ExceptionList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::_retn (void)
-{
-  ::Dynamic::ExceptionList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_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 Dynamic::ExceptionList_out
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (const ::Dynamic::ExceptionList_out &p)
-  : ptr_ (ACE_const_cast (ExceptionList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::Dynamic::ExceptionList_out &
-Dynamic::ExceptionList_out::operator= (const ::Dynamic::ExceptionList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList_out &
-Dynamic::ExceptionList_out::operator= (ExceptionList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_out::operator ::Dynamic::ExceptionList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *&
-Dynamic::ExceptionList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-Dynamic::ExceptionList_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_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index a09e1f2cdbc..efd946270de 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -23,7 +23,10 @@
 //
 // ================================================================
 #pragma prefix "omg.org"
+
 #include "IOP.pidl"
+#include "OctetSeq.pidl"
+
 module GIOP
 {
   typedef short AddressingDisposition;
@@ -44,7 +47,7 @@ module GIOP
 
   union TargetAddress switch (AddressingDisposition)
   {
-    case KeyAddr: sequence <octet> object_key;
+    case KeyAddr: CORBA::OctetSeq object_key;
     case ProfileAddr: IOP::TaggedProfile profile;
     case ReferenceAddr: IORAddressingInfo ior;
   };
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index df2c8fe857d..47703e00f23 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -23,27 +23,17 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   GIOPC.h
-//
-// = DESCRIPTION
-//   Generated from GIOP1_2.pidl, that contains a part of the new data
-//   type definitions for GIOP1.2 module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//   hand crafted by Balachandran Natarajan <bala@cs.wustl.edu>
-// ================================================================
+#include "GIOPC.h"
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo_i.h"
+#include "tao/ClientInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-#include "GIOPC.h"
-#include "tao/Environment.h"
-#include "tao/Any_T.h"
-#include "tao/ORB_Core.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -148,7 +138,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -157,6 +147,25 @@ void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      Version
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      Version \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
@@ -292,7 +301,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -301,7 +310,38 @@ void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:92
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      IORAddressingInfo
+    >;
+
+template class
+  TAO_Out_T<
+      IORAddressingInfo,
+      IORAddressingInfo_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      IORAddressingInfo \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      IORAddressingInfo, \
+      IORAddressingInfo_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:91
 
 GIOP::TargetAddress::TargetAddress (void)
 {
@@ -325,7 +365,7 @@ GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
         {
           ACE_NEW (
               this->u_.object_key_,
-              TAO::ObjectKey (*u.u_.object_key_)
+              CORBA::OctetSeq (*u.u_.object_key_)
             );
         }
     }
@@ -400,7 +440,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
         {
           ACE_NEW_RETURN (
               this->u_.object_key_,
-              TAO::ObjectKey (*u.u_.object_key_),
+              CORBA::OctetSeq (*u.u_.object_key_),
               *this
             );
         }
@@ -497,12 +537,29 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
   ACE_NTOHL (0x6f626a65), 
   ACE_NTOHL (0x63745f6b), 
   ACE_NTOHL (0x65790000),  // name = object_key
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
+    31,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+        9,
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_octet,
+
+      0U,
 
-    0U,
 
   ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
   8,
@@ -646,6 +703,37 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      TargetAddress
+    >;
+
+template class
+  TAO_Out_T<
+      TargetAddress,
+      TargetAddress_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      TargetAddress \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      TargetAddress, \
+      TargetAddress_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -841,5 +929,3 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::TargetAddress>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
-
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index 25fc4b2a83d..bceb50c4f4c 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -2,22 +2,6 @@
 //
 // $Id$
 
-//=============================================================================
-/**
- *  @file   GIOPC.h
- *
- *  $Id$
-
- *
- * Generated from GIOP1_2.pidl, that contains a part of the new data
- * type definitions for GIOP1.2 module.
- * The code was generated by the IDL compiler and then hand-crafted
- * to reduce the includes interdependencies.
- * hand crafted by Balachandran Natarajan <bala@cs.wustl.edu>
- *
- */
-//=============================================================================
-
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -35,12 +19,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Readers Note:
-// This file is named GIOPC.h intentionally. Shortly the file GIOP.h
-// in $TAO_ROOT/ta would dissappear giving way to new files once the
-// pluggable messaging stuff is done. So I would assume that there
-// should be no such name clashes.
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
@@ -51,6 +29,8 @@
 #include "tao/corbafwd.h"
 #include "tao/IOPC.h"
 #include "tao/Object_KeyC.h"
+#include "OctetSeqC.h"
+#include "tao/VarOut_T.h"
 
 #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
 #include "ace/streams.h"
@@ -91,7 +71,7 @@ TAO_NAMESPACE  GIOP
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
@@ -117,72 +97,65 @@ TAO_NAMESPACE  GIOP
   const CORBA::Short ReferenceAddr = 2;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class IORAddressingInfo_var;
+  struct Version;
   
-  struct TAO_Export IORAddressingInfo
+  typedef
+    TAO_Fixed_Var_T<
+        Version
+      >
+    Version_var;
+  
+  typedef
+    Version &
+    Version_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  
+  struct TAO_Export Version
   {
-    typedef IORAddressingInfo_var _var_type;
+    typedef Version_var _var_type;
     
     static void _tao_any_destructor (void *);
-    CORBA::ULong selected_profile_index;
-    IOP::IOR ior;
+    CORBA::Octet major;
+    CORBA::Octet minor;
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  class TAO_Export IORAddressingInfo_var
-  {
-  public:
-    IORAddressingInfo_var (void);
-    IORAddressingInfo_var (IORAddressingInfo *);
-    IORAddressingInfo_var (const IORAddressingInfo_var &);
-    ~IORAddressingInfo_var (void);
-    
-    IORAddressingInfo_var &operator= (IORAddressingInfo *);
-    IORAddressingInfo_var &operator= (const IORAddressingInfo_var &);
-    IORAddressingInfo *operator-> (void);
-    const IORAddressingInfo *operator-> (void) const;
-    
-    operator const IORAddressingInfo &() const;
-    operator IORAddressingInfo &();
-    operator IORAddressingInfo &() const;
-    
-    // Variable-size types only.
-    operator IORAddressingInfo *&();
-    
-    // in, inout, out, _retn 
-    const IORAddressingInfo &in (void) const;
-    IORAddressingInfo &inout (void);
-    IORAddressingInfo *&out (void);
-    IORAddressingInfo *_retn (void);
-    IORAddressingInfo *ptr (void) const;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
   
-  private:
-    IORAddressingInfo *ptr_;
-  };
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct IORAddressingInfo;
+  
+  typedef
+    TAO_Var_Var_T<
+        IORAddressingInfo
+      >
+    IORAddressingInfo_var;
+  
+  typedef
+    TAO_Out_T<
+        IORAddressingInfo,
+        IORAddressingInfo_var
+      >
+    IORAddressingInfo_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
-  class TAO_Export IORAddressingInfo_out
+  struct TAO_Export IORAddressingInfo
   {
-  public:
-    IORAddressingInfo_out (IORAddressingInfo *&);
-    IORAddressingInfo_out (IORAddressingInfo_var &);
-    IORAddressingInfo_out (const IORAddressingInfo_out &);
-    IORAddressingInfo_out &operator= (const IORAddressingInfo_out &);
-    IORAddressingInfo_out &operator= (IORAddressingInfo *);
-    operator IORAddressingInfo *&();
-    IORAddressingInfo *&ptr (void);
-    IORAddressingInfo *operator-> (void);
+    typedef IORAddressingInfo_var _var_type;
     
-  private:
-    IORAddressingInfo *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const IORAddressingInfo_var &);
+    static void _tao_any_destructor (void *);
+    CORBA::ULong selected_profile_index;
+    IOP::IOR ior;
   };
   
   // TAO_IDL - Generated from
@@ -191,13 +164,26 @@ TAO_NAMESPACE  GIOP
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:53
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  class TargetAddress;
+  
+  typedef
+    TAO_Var_Var_T<
+        TargetAddress
+      >
+    TargetAddress_var;
+  
+  typedef
+    TAO_Out_T<
+        TargetAddress,
+        TargetAddress_var
+      >
+    TargetAddress_out;
 
 #if !defined (_GIOP_TARGETADDRESS_CH_)
 #define _GIOP_TARGETADDRESS_CH_
   
-  class TargetAddress_var;
-  
   class TAO_Export TargetAddress
   {
   public:
@@ -209,39 +195,39 @@ TAO_NAMESPACE  GIOP
     TargetAddress &operator= (const TargetAddress &);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:115
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:114
     
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:111
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:108
     
     typedef TargetAddress_var _var_type;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:507
     
-    void object_key (const TAO::ObjectKey &);
-    const TAO::ObjectKey &object_key (void) const;
-    TAO::ObjectKey &object_key (void);
+    void object_key (const CORBA::OctetSeq &);
+    const CORBA::OctetSeq &object_key (void) const;
+    CORBA::OctetSeq &object_key (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615
     
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615
     
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
     ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:145
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:142
     
     void _default (void);
   private:
@@ -252,7 +238,7 @@ TAO_NAMESPACE  GIOP
     {
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:407
-      TAO::ObjectKey *object_key_;
+      CORBA::OctetSeq *object_key_;
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
       IOP::TaggedProfile *profile_;
@@ -272,116 +258,6 @@ TAO_NAMESPACE  GIOP
 
 #endif /* end #if !defined */
 
-#if !defined (_GIOP_TARGETADDRESS___VAR_CH_)
-#define _GIOP_TARGETADDRESS___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:85
-  
-  class TAO_Export TargetAddress_var
-  {
-  public:
-    TargetAddress_var (void);
-    TargetAddress_var (TargetAddress *);
-    TargetAddress_var (const TargetAddress_var &);
-    ~TargetAddress_var (void);
-    
-    TargetAddress_var &operator= (TargetAddress *);
-    TargetAddress_var &operator= (const TargetAddress_var &);
-    TargetAddress *operator-> (void);
-    const TargetAddress *operator-> (void) const;
-    
-    operator const TargetAddress &() const;
-    operator TargetAddress &();
-    operator TargetAddress &() const;
-      // Variable size types only.
-    operator TargetAddress *&();
-    
-    // in, inout, out, _retn 
-    const TargetAddress &in (void) const;
-    TargetAddress &inout (void);
-    TargetAddress *&out (void);
-    TargetAddress *_retn (void);
-    TargetAddress *ptr (void) const;
-  
-  private:
-    TargetAddress *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_GIOP_TARGETADDRESS___OUT_CH_)
-#define _GIOP_TARGETADDRESS___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:475
-  
-  class TAO_Export TargetAddress_out
-  {
-  public:
-    TargetAddress_out (TargetAddress *&);
-    TargetAddress_out (TargetAddress_var &);
-    TargetAddress_out (const TargetAddress_out &);
-    TargetAddress_out &operator= (const TargetAddress_out &);
-    TargetAddress_out &operator= (TargetAddress *);
-    operator TargetAddress *&();
-    TargetAddress *&ptr (void);
-    TargetAddress *operator-> (void);
-    
-  private:
-    TargetAddress *&ptr_;
-    // assignment from T_var not allowed.
-    void operator= (const TargetAddress_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // We dont have the _var _out for this struct. If need arises we can
-  // add them later. For the present the Version struct alone should be
-  // sufficient
-  struct TAO_Export Version
-  {
-    static void _tao_any_destructor (void *);
-    CORBA::Octet major;
-    CORBA::Octet minor;
-  };
-
-  class  TAO_Export Version_var
-  {
-  public:
-    Version_var (void);
-    Version_var (Version *);
-    Version_var (const Version_var &);
-    // Fixed-size types only.
-    Version_var (const Version &);
-    ~Version_var (void);
-
-    Version_var &operator= (Version *);
-    Version_var &operator= (const Version_var &);
-    // Fixed-size types only.
-    Version_var &operator= (const Version &);
-    Version *operator-> (void);
-    const Version *operator-> (void) const;
-
-    operator const Version &() const;
-    operator Version &();
-    operator Version &() const;
-
-    // in, inout, out, _retn
-    const Version &in (void) const;
-    Version &inout (void);
-    Version &out (void);
-    Version _retn (void);
-    Version *ptr (void) const;
-
-  private:
-    Version *ptr_;
-  };
-
-  typedef Version &Version_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
@@ -441,7 +317,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.i"
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index 3a36abb053d..531f5d1255b 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -21,380 +21,6 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class GIOP::Version_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::Version_var::Version_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::Version_var::Version_var (Version *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::GIOP::Version (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version &p)
-{
-  ACE_NEW (this->ptr_, ::GIOP::Version (p));
-}
-
-ACE_INLINE
-GIOP::Version_var::~Version_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var &
-GIOP::Version_var::operator= (Version *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Version *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Version (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Version *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::GIOP::Version (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::GIOP::Version *
-GIOP::Version_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version *
-GIOP::Version_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var::operator const ::GIOP::Version &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::GIOP::Version &
-GIOP::Version_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version &
-GIOP::Version_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::GIOP::Version &
-GIOP::Version_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version
-GIOP::Version_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version *
-GIOP::Version_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class GIOP::IORAddressingInfo_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (IORAddressingInfo *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (const ::GIOP::IORAddressingInfo_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::GIOP::IORAddressingInfo (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::~IORAddressingInfo_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (IORAddressingInfo *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (const ::GIOP::IORAddressingInfo_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          IORAddressingInfo *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              IORAddressingInfo (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              IORAddressingInfo *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator const ::GIOP::IORAddressingInfo &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::GIOP::IORAddressingInfo &
-GIOP::IORAddressingInfo_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo &
-GIOP::IORAddressingInfo_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::GIOP::IORAddressingInfo *&
-GIOP::IORAddressingInfo_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::_retn (void)
-{
-  ::GIOP::IORAddressingInfo *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_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 GIOP::IORAddressingInfo_out
-// *************************************************************
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (::GIOP::IORAddressingInfo *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (IORAddressingInfo_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (const ::GIOP::IORAddressingInfo_out &p)
-  : ptr_ (ACE_const_cast (IORAddressingInfo_out&, p).ptr_)
-{}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (const ::GIOP::IORAddressingInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORAddressingInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (IORAddressingInfo *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-GIOP::IORAddressingInfo_out::operator ::GIOP::IORAddressingInfo *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *&
-GIOP::IORAddressingInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ci.cpp:51
 
 // *************************************************************
@@ -428,25 +54,25 @@ GIOP::TargetAddress::_d (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:899
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:906
 
 // Accessor to set the member.
 ACE_INLINE
 void
-GIOP::TargetAddress::object_key (const TAO::ObjectKey &val)
+GIOP::TargetAddress::object_key (const CORBA::OctetSeq &val)
 {
   // Set the discriminant value.
   this->_reset (0, 0);
   this->disc_ = 0;
   ACE_NEW (
       this->u_.object_key_,
-      TAO::ObjectKey (val)
+      CORBA::OctetSeq (val)
     );
 }
 
 // Readonly get method.
 ACE_INLINE
-const TAO::ObjectKey &
+const CORBA::OctetSeq &
 GIOP::TargetAddress::object_key (void) const
 {
   return *this->u_.object_key_;
@@ -454,14 +80,14 @@ GIOP::TargetAddress::object_key (void) const
 
 // Read/write get method.
 ACE_INLINE
-TAO::ObjectKey &
+CORBA::OctetSeq &
 GIOP::TargetAddress::object_key (void)
 {
   return *this->u_.object_key_;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1215
 
 // Accessor to set the member.
 ACE_INLINE
@@ -494,7 +120,7 @@ GIOP::TargetAddress::profile (void)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1215
 
 // Accessor to set the member.
 ACE_INLINE
@@ -526,238 +152,8 @@ GIOP::TargetAddress::ior (void)
   return *this->u_.ior_;
 }
 
-#if !defined (_GIOP_TARGETADDRESS___VAR_CI_)
-#define _GIOP_TARGETADDRESS___VAR_CI_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:211
-
-// *************************************************************
-// Inline operations for class GIOP::TargetAddress_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (TargetAddress *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (const ::GIOP::TargetAddress_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::GIOP::TargetAddress (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::~TargetAddress_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (TargetAddress *_tao_union_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_union_var;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (const ::GIOP::TargetAddress_var &_tao_union_var)
-{
-  if (this != &_tao_union_var)
-    {
-      if (_tao_union_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          TargetAddress *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              TargetAddress (*_tao_union_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              TargetAddress *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::GIOP::TargetAddress *
-GIOP::TargetAddress_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::operator const ::GIOP::TargetAddress &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() const// cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-GIOP::TargetAddress_var::operator ::GIOP::TargetAddress *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-const ::GIOP::TargetAddress &
-GIOP::TargetAddress_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress &
-GIOP::TargetAddress_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE
-::GIOP::TargetAddress *&
-GIOP::TargetAddress_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_var::_retn (void)
-{
-  ::GIOP::TargetAddress *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-#endif /* end #if !defined */
-
-#if !defined (_GIOP_TARGETADDRESS___OUT_CI_)
-#define _GIOP_TARGETADDRESS___OUT_CI_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:556
-
-// *************************************************************
-// Inline operations for class GIOP::TargetAddress_out
-// *************************************************************
-
-ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (TargetAddress *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (TargetAddress_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (const ::GIOP::TargetAddress_out &p)
-  : ptr_ (ACE_const_cast (TargetAddress_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (const ::GIOP::TargetAddress_out &p)
-{
-  this->ptr_ = ACE_const_cast (TargetAddress_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (TargetAddress *_tao_union_out)
-{
-  this->ptr_ = _tao_union_out;
-  return *this;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_out::operator ::GIOP::TargetAddress *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *&
-GIOP::TargetAddress_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -798,7 +194,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -839,24 +235,6 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
-#define _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    TAO::ObjectKey &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    TAO::ObjectKey &
-  );
-
-#endif /* _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_ */
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ci.cpp:69
 
 ACE_INLINE
@@ -914,7 +292,7 @@ CORBA::Boolean operator>> (
   {
     case 0:
       {
-        TAO::ObjectKey _tao_union_tmp;
+        CORBA::OctetSeq _tao_union_tmp;
         result = strm >> _tao_union_tmp;
         
         if (result)
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 2d0745c3e3c..f07daa9acf4 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -86,7 +86,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -94,126 +94,81 @@ void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// 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_IIOP_LISTENPOINTLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_
-
-void
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_allocate_buffer (CORBA::ULong length)
-{
-  IIOP::ListenPoint* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IIOP::ListenPoint *old =
-        ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IIOP::ListenPoint *tmp =
-    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_IIOP_LISTENPOINTLIST_CS_)
-#define _IIOP_LISTENPOINTLIST_CS_
+template class
+  TAO_Var_Var_T<
+      ListenPoint
+    >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+template class
+  TAO_Out_T<
+      ListenPoint,
+      ListenPoint_var
+    >;
 
-// *************************************************************
-// IIOP::ListenPointList
-// *************************************************************
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-IIOP::ListenPointList::ListenPointList (void)
-{}
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ListenPoint \
+    >
 
-IIOP::ListenPointList::ListenPointList (CORBA::ULong max)
-  : 
+# pragma instantiate \
+  TAO_Out_T< \
+      ListenPoint, \
+      ListenPoint_var \
+    >
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IIOP::ListenPoint>
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
-IIOP::ListenPointList::ListenPointList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IIOP::ListenPoint *buffer,
-    CORBA::Boolean release
-  )
-  : 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IIOP::ListenPoint>
+template class
+  TAO_Unbounded_Sequence<
+      IIOP::ListenPoint
+    >;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+template class
+  TAO_VarSeq_Var_T<
+      ListenPointList,
+      IIOP::ListenPoint
+    >;
 
-IIOP::ListenPointList::ListenPointList (const ListenPointList &seq)
-  : 
+template class
+  TAO_Seq_Out_T<
+      ListenPointList,
+      ListenPointList_var,
+      IIOP::ListenPoint
+    >;
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IIOP::ListenPoint>
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+# pragma instantiate \
+  TAO_Unbounded_Sequence< \
+      IIOP::ListenPoint \
+    >
 
-IIOP::ListenPointList::~ListenPointList (void) // dtor
-{}
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ListenPointList, \
+      IIOP::ListenPoint \
+    >
 
-void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ListenPointList *tmp = ACE_static_cast (ListenPointList*, _tao_void_pointer);
-  delete tmp;
-}
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ListenPointList, \
+      ListenPointList_var, \
+      IIOP::ListenPoint \
+    >
 
-#endif /* end #if !defined */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -396,7 +351,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -404,6 +359,37 @@ void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer
   delete tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      BiDirIIOPServiceContext
+    >;
+
+template class
+  TAO_Out_T<
+      BiDirIIOPServiceContext,
+      BiDirIIOPServiceContext_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      BiDirIIOPServiceContext \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      BiDirIIOPServiceContext, \
+      BiDirIIOPServiceContext_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -527,6 +513,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IIOP::ListenPointList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPointList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -593,7 +586,7 @@ CORBA::Boolean operator>>= (
 #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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index a8ca954fe85..d0f850bca44 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -37,6 +37,8 @@
 #include "tao/Managed_Types.h"
 #include "tao/Sequence_T.h"
 #include "tao/CDR.h"
+#include "tao/VarOut_T.h"
+#include "tao/Seq_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -68,9 +70,25 @@ TAO_NAMESPACE  IIOP
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class ListenPoint_var;
+  struct ListenPoint;
+  
+  typedef
+    TAO_Var_Var_T<
+        ListenPoint
+      >
+    ListenPoint_var;
+  
+  typedef
+    TAO_Out_T<
+        ListenPoint,
+        ListenPoint_var
+      >
+    ListenPoint_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export ListenPoint
   {
@@ -82,244 +100,59 @@ TAO_NAMESPACE  IIOP
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export ListenPoint_var
-  {
-  public:
-    ListenPoint_var (void);
-    ListenPoint_var (ListenPoint *);
-    ListenPoint_var (const ListenPoint_var &);
-    ~ListenPoint_var (void);
-    
-    ListenPoint_var &operator= (ListenPoint *);
-    ListenPoint_var &operator= (const ListenPoint_var &);
-    ListenPoint *operator-> (void);
-    const ListenPoint *operator-> (void) const;
-    
-    operator const ListenPoint &() const;
-    operator ListenPoint &();
-    operator ListenPoint &() const;
-    
-    // Variable-size types only.
-    operator ListenPoint *&();
-    
-    // in, inout, out, _retn 
-    const ListenPoint &in (void) const;
-    ListenPoint &inout (void);
-    ListenPoint *&out (void);
-    ListenPoint *_retn (void);
-    ListenPoint *ptr (void) const;
-  
-  private:
-    ListenPoint *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export ListenPoint_out
-  {
-  public:
-    ListenPoint_out (ListenPoint *&);
-    ListenPoint_out (ListenPoint_var &);
-    ListenPoint_out (const ListenPoint_out &);
-    ListenPoint_out &operator= (const ListenPoint_out &);
-    ListenPoint_out &operator= (ListenPoint *);
-    operator ListenPoint *&();
-    ListenPoint *&ptr (void);
-    ListenPoint *operator-> (void);
-    
-  private:
-    ListenPoint *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ListenPoint_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
   
-  // 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_IIOP_LISTENPOINTLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Sequence_IIOP_ListenPointList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (void);
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ListenPoint *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (
-        const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-      );
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList &operator= (
-        const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void);
-    
-    // = Accessors.
-    ListenPoint &operator[] (CORBA::ULong i);
-    const ListenPoint &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ListenPoint *allocbuf (CORBA::ULong size);
-    static void freebuf (ListenPoint *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ListenPoint *get_buffer (CORBA::Boolean orphan = 0);
-    const ListenPoint *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ListenPoint *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IIOP_LISTENPOINTLIST_CH_)
-#define _IIOP_LISTENPOINTLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ListenPointList;
-  class ListenPointList_var;
-  
-  // *************************************************************
-  // IIOP::ListenPointList
-  // *************************************************************
-  
-  class TAO_Export ListenPointList : 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_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ListenPoint>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    ListenPointList (void);
-    ListenPointList (CORBA::ULong max);
-    ListenPointList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ListenPoint *buffer, 
-        CORBA::Boolean release = 0
-      );
-    ListenPointList (const ListenPointList &);
-    ~ListenPointList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ListenPointList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IIOP_LISTENPOINTLIST___VAR_CH_)
-#define _IIOP_LISTENPOINTLIST___VAR_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  
+  typedef
+    TAO_Unbounded_Sequence<
+        IIOP::ListenPoint
+      >
+    ListenPointList;
+  
+  typedef
+    TAO_VarSeq_Var_T<
+        ListenPointList,
+        IIOP::ListenPoint
+      >
+    ListenPointList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ListenPointList,
+        ListenPointList_var,
+        IIOP::ListenPoint
+      >
+    ListenPointList_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class IIOP::ListenPointList_var
-  // *************************************************************
-  
-  class TAO_Export ListenPointList_var
-  {
-  public:
-    ListenPointList_var (void);
-    ListenPointList_var (ListenPointList *);
-    ListenPointList_var (const ListenPointList_var &);
-    ~ListenPointList_var (void);
-    
-    ListenPointList_var &operator= (ListenPointList *);
-    ListenPointList_var &operator= (const ListenPointList_var &);
-    ListenPointList *operator-> (void);
-    const ListenPointList *operator-> (void) const;
-    
-    operator const ListenPointList &() const;
-    operator ListenPointList &();
-    operator ListenPointList &() const;
-    
-    // Variable-size base types only.
-    operator ListenPointList *&();
-    
-    ListenPoint & operator[] (CORBA::ULong index);
-    const ListenPoint & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ListenPointList &in (void) const;
-    ListenPointList &inout (void);
-    ListenPointList *&out (void);
-    ListenPointList *_retn (void);
-    ListenPointList *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    ListenPointList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IIOP_LISTENPOINTLIST___OUT_CH_)
-#define _IIOP_LISTENPOINTLIST___OUT_CH_
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ListenPointList_out
-  {
-  public:
-    ListenPointList_out (ListenPointList *&);
-    ListenPointList_out (ListenPointList_var &);
-    ListenPointList_out (const ListenPointList_out &);
-    ListenPointList_out &operator= (const ListenPointList_out &);
-    ListenPointList_out &operator= (ListenPointList *);
-    operator ListenPointList *&();
-    ListenPointList *&ptr (void);
-    ListenPointList *operator-> (void);
-    ListenPoint & operator[] (CORBA::ULong index);
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  private:
-    ListenPointList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ListenPointList_var &);
-  };
-
-#endif /* end #if !defined */
+  struct BiDirIIOPServiceContext;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Var_Var_T<
+        BiDirIIOPServiceContext
+      >
+    BiDirIIOPServiceContext_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
+  typedef
+    TAO_Out_T<
+        BiDirIIOPServiceContext,
+        BiDirIIOPServiceContext_var
+      >
+    BiDirIIOPServiceContext_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class BiDirIIOPServiceContext_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export BiDirIIOPServiceContext
   {
@@ -330,61 +163,6 @@ TAO_NAMESPACE  IIOP
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export BiDirIIOPServiceContext_var
-  {
-  public:
-    BiDirIIOPServiceContext_var (void);
-    BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *);
-    BiDirIIOPServiceContext_var (const BiDirIIOPServiceContext_var &);
-    ~BiDirIIOPServiceContext_var (void);
-    
-    BiDirIIOPServiceContext_var &operator= (BiDirIIOPServiceContext *);
-    BiDirIIOPServiceContext_var &operator= (const BiDirIIOPServiceContext_var &);
-    BiDirIIOPServiceContext *operator-> (void);
-    const BiDirIIOPServiceContext *operator-> (void) const;
-    
-    operator const BiDirIIOPServiceContext &() const;
-    operator BiDirIIOPServiceContext &();
-    operator BiDirIIOPServiceContext &() const;
-    
-    // Variable-size types only.
-    operator BiDirIIOPServiceContext *&();
-    
-    // in, inout, out, _retn 
-    const BiDirIIOPServiceContext &in (void) const;
-    BiDirIIOPServiceContext &inout (void);
-    BiDirIIOPServiceContext *&out (void);
-    BiDirIIOPServiceContext *_retn (void);
-    BiDirIIOPServiceContext *ptr (void) const;
-  
-  private:
-    BiDirIIOPServiceContext *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export BiDirIIOPServiceContext_out
-  {
-  public:
-    BiDirIIOPServiceContext_out (BiDirIIOPServiceContext *&);
-    BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &);
-    BiDirIIOPServiceContext_out (const BiDirIIOPServiceContext_out &);
-    BiDirIIOPServiceContext_out &operator= (const BiDirIIOPServiceContext_out &);
-    BiDirIIOPServiceContext_out &operator= (BiDirIIOPServiceContext *);
-    operator BiDirIIOPServiceContext *&();
-    BiDirIIOPServiceContext *&ptr (void);
-    BiDirIIOPServiceContext *operator-> (void);
-    
-  private:
-    BiDirIIOPServiceContext *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const BiDirIIOPServiceContext_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
@@ -431,7 +209,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64
 
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_
 #define _TAO_CDR_OP_IIOP_ListenPointList_H_
@@ -459,7 +237,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IIOPC.i"
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
index bd3a849fa93..b03a811ff87 100644
--- a/TAO/tao/IIOPC.i
+++ b/TAO/tao/IIOPC.i
@@ -21,887 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IIOP::ListenPoint_var
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (ListenPoint *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::~ListenPoint_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (ListenPoint *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ListenPoint *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ListenPoint (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ListenPoint *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::operator const ::IIOP::ListenPoint &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IIOP::ListenPoint_var::operator ::IIOP::ListenPoint *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IIOP::ListenPoint &
-IIOP::ListenPoint_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint &
-IIOP::ListenPoint_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IIOP::ListenPoint *&
-IIOP::ListenPoint_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::_retn (void)
-{
-  ::IIOP::ListenPoint *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_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 IIOP::ListenPoint_out
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (::IIOP::ListenPoint *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p)
-  : ptr_ (ACE_const_cast (ListenPoint_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IIOP::ListenPoint_out &
-IIOP::ListenPoint_out::operator= (const ::IIOP::ListenPoint_out &p)
-{
-  this->ptr_ = ACE_const_cast (ListenPoint_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_out &
-IIOP::ListenPoint_out::operator= (ListenPoint *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IIOP::ListenPoint_out::operator ::IIOP::ListenPoint *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *&
-IIOP::ListenPoint_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_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_IIOP_LISTENPOINTLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_
-
-ACE_INLINE
-IIOP::ListenPoint *
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (CORBA::ULong size)
-{
-  IIOP::ListenPoint *retval = 0;
-  ACE_NEW_RETURN (retval, IIOP::ListenPoint[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (IIOP::ListenPoint *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (void)
-{
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IIOP::ListenPoint *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (
-    const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IIOP::ListenPoint *tmp1 =
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->maximum_);
-      IIOP::ListenPoint * const tmp2 =
-        ACE_reinterpret_cast (IIOP::ListenPoint * 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;
-    }
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList &
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator= (
-    const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          IIOP::ListenPoint *tmp =
-            ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IIOP::ListenPoint *tmp1 =
-    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-  IIOP::ListenPoint * const tmp2 =
-    ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-IIOP::ListenPoint &
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  IIOP::ListenPoint* tmp =
-    ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const IIOP::ListenPoint &
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  IIOP::ListenPoint * const tmp =
-    ACE_reinterpret_cast (IIOP::ListenPoint* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-IIOP::ListenPoint *
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (CORBA::Boolean orphan)
-{
-  IIOP::ListenPoint *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const IIOP::ListenPoint *
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IIOP::ListenPoint * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IIOP::ListenPoint *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      IIOP::ListenPoint *tmp =
-        ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IIOP_LISTENPOINTLIST_CI_)
-#define _IIOP_LISTENPOINTLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IIOP::ListenPointList_var
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (ListenPointList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::~ListenPointList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var &
-IIOP::ListenPointList_var::operator= (ListenPointList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList_var &
-IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ListenPointList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ListenPointList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ListenPointList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IIOP::ListenPointList *
-IIOP::ListenPointList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::operator const ::IIOP::ListenPointList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IIOP::ListenPointList_var::operator ::IIOP::ListenPointList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint &
-IIOP::ListenPointList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const IIOP::ListenPoint &
-IIOP::ListenPointList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IIOP::ListenPoint &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::IIOP::ListenPointList &
-IIOP::ListenPointList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList &
-IIOP::ListenPointList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *&
-IIOP::ListenPointList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_var::_retn (void)
-{
-  ::IIOP::ListenPointList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_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 IIOP::ListenPointList_out
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (ListenPointList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p)
-  : ptr_ (ACE_const_cast (ListenPointList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IIOP::ListenPointList_out &
-IIOP::ListenPointList_out::operator= (const ::IIOP::ListenPointList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ListenPointList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList_out &
-IIOP::ListenPointList_out::operator= (ListenPointList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_out::operator ::IIOP::ListenPointList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *&
-IIOP::ListenPointList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint &
-IIOP::ListenPointList_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 IIOP::BiDirIIOPServiceContext_var
-// *************************************************************
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          BiDirIIOPServiceContext *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              BiDirIIOPServiceContext (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              BiDirIIOPServiceContext *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator const ::IIOP::BiDirIIOPServiceContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IIOP::BiDirIIOPServiceContext &
-IIOP::BiDirIIOPServiceContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext &
-IIOP::BiDirIIOPServiceContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *&
-IIOP::BiDirIIOPServiceContext_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::_retn (void)
-{
-  ::IIOP::BiDirIIOPServiceContext *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_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 IIOP::BiDirIIOPServiceContext_out
-// *************************************************************
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (::IIOP::BiDirIIOPServiceContext *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p)
-  : ptr_ (ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out &
-IIOP::BiDirIIOPServiceContext_out::operator= (const ::IIOP::BiDirIIOPServiceContext_out &p)
-{
-  this->ptr_ = ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out &
-IIOP::BiDirIIOPServiceContext_out::operator= (BiDirIIOPServiceContext *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IIOP::BiDirIIOPServiceContext_out::operator ::IIOP::BiDirIIOPServiceContext *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *&
-IIOP::BiDirIIOPServiceContext_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -960,7 +80,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index c6278c09f30..529ef1f67b5 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -41,7 +41,7 @@ module IOP
 
   struct TaggedProfile {
     ProfileId       tag;
-    sequence<octet> profile_data;
+    CORBA::OctetSeq profile_data;
   };
 
   struct IOR {
@@ -52,7 +52,7 @@ module IOP
   typedef unsigned long ComponentId;
   struct TaggedComponent {
     ComponentId     tag;
-    sequence<octet> component_data;
+    CORBA::OctetSeq component_data;
   };
   typedef sequence<TaggedComponent> MultipleComponentProfile;
   typedef sequence<TaggedComponent> TaggedComponentList;
@@ -77,7 +77,7 @@ module IOP
   typedef unsigned long ServiceId;
   struct ServiceContext {
     ServiceId          context_id;
-    sequence <octet>   context_data;
+    CORBA::OctetSeq    context_data;
   };
   typedef sequence <ServiceContext> ServiceContextList;
 
@@ -138,6 +138,4 @@ module IOP
   };
 };
 
-#pragma prefix ""
-
 #endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/Seq_VarOut_T.inl b/TAO/tao/Seq_VarOut_T.inl
index bd07c711d75..a2a606e6af8 100644
--- a/TAO/tao/Seq_VarOut_T.inl
+++ b/TAO/tao/Seq_VarOut_T.inl
@@ -113,7 +113,7 @@ ACE_INLINE
 T *
 TAO_Seq_Var_Base_T<T,T_elem>::_retn (void)
 {
-  T * Stmp = this->ptr_;
+  T * tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 2b9952db6f8..db07c4c48b5 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -245,8 +245,6 @@ namespace CORBA
 
   class Current;
   typedef Current *Current_ptr;
-  class Current_var;
-  class Current_out;
 
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;