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

1 files changed, 479 insertions, 304 deletions

diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index f61aac328e9..3a36abb053d 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -1,121 +1,317 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class GIOP::IORAddressingInfo_var
+// Inline operations for class GIOP::Version_var
 // *************************************************************
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (void) // default constructor
+GIOP::Version_var::Version_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (GIOP::IORAddressingInfo *p)
+GIOP::Version_var::Version_var (Version *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (const GIOP::IORAddressingInfo_var &p) // copy constructor
+GIOP::Version_var::Version_var (const ::GIOP::Version_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, GIOP::IORAddressingInfo (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::GIOP::Version (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
+// Fixed-size types only.
 ACE_INLINE
-GIOP::IORAddressingInfo_var::~IORAddressingInfo_var (void) // destructor
+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::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (GIOP::IORAddressingInfo *p)
+ACE_INLINE
+GIOP::Version_var &
+GIOP::Version_var::operator= (Version *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (const GIOP::IORAddressingInfo_var &p)
+ACE_INLINE
+::GIOP::Version_var &
+GIOP::Version_var::operator= (const ::GIOP::Version_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          GIOP::IORAddressingInfo *deep_copy =
-            new GIOP::IORAddressingInfo (*p.ptr_);
-
+          Version *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              Version (*_tao_struct_var.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
-              GIOP::IORAddressingInfo *tmp = deep_copy;
+              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 *
+ACE_INLINE const ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+ACE_INLINE ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::operator const GIOP::IORAddressingInfo &() const // cast
+GIOP::IORAddressingInfo_var::operator const ::GIOP::IORAddressingInfo &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() // cast
+GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() const// cast
+GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const GIOP::IORAddressingInfo &
+// 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 &
+ACE_INLINE ::GIOP::IORAddressingInfo &
 GIOP::IORAddressingInfo_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE GIOP::IORAddressingInfo *&
+// Mapping for variable size.
+ACE_INLINE ::GIOP::IORAddressingInfo *&
 GIOP::IORAddressingInfo_var::out (void)
 {
   delete this->ptr_;
@@ -123,33 +319,36 @@ GIOP::IORAddressingInfo_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+ACE_INLINE ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::_retn (void)
 {
-  GIOP::IORAddressingInfo *tmp = this->ptr_;
+  ::GIOP::IORAddressingInfo *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+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)
+GIOP::IORAddressingInfo_out::IORAddressingInfo_out (::GIOP::IORAddressingInfo *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (GIOP::IORAddressingInfo_var &p) // constructor from _var
+GIOP::IORAddressingInfo_out::IORAddressingInfo_out (IORAddressingInfo_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -157,115 +356,119 @@ GIOP::IORAddressingInfo_out::IORAddressingInfo_out (GIOP::IORAddressingInfo_var
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (const GIOP::IORAddressingInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (GIOP::IORAddressingInfo_out&,p).ptr_)
+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)
+ACE_INLINE
+GIOP::IORAddressingInfo_out &
+GIOP::IORAddressingInfo_out::operator= (const ::GIOP::IORAddressingInfo_out &p)
 {
-  this->ptr_ = ACE_const_cast (GIOP::IORAddressingInfo_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (IORAddressingInfo_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (GIOP::IORAddressingInfo *p)
+ACE_INLINE
+GIOP::IORAddressingInfo_out &
+GIOP::IORAddressingInfo_out::operator= (IORAddressingInfo *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-GIOP::IORAddressingInfo_out::operator GIOP::IORAddressingInfo *&() // cast
+ACE_INLINE 
+GIOP::IORAddressingInfo_out::operator ::GIOP::IORAddressingInfo *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *&
+ACE_INLINE ::GIOP::IORAddressingInfo *&
 GIOP::IORAddressingInfo_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+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
+
 // *************************************************************
 // Inline operations for union GIOP::TargetAddress
 // *************************************************************
 
-// destructor
-ACE_INLINE
-GIOP::TargetAddress::~TargetAddress (void)
-{
-  // finalize
-  this->_reset (this->disc_, 1);
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ci.cpp:164
 
-// this reset method is used by the decoding engine
-ACE_INLINE void
-GIOP::TargetAddress::_reset (void)
-{
-  this->_reset (this->disc_, 1);
-  ACE_OS::memcpy (&this->u_, 0, sizeof (this->u_));
-}
-
-// the implicit _default () method
-ACE_INLINE void
+ACE_INLINE
+void 
 GIOP::TargetAddress::_default ()
 {
   this->disc_ = -32768;
 }
 
-// accessor to set the discriminant
-ACE_INLINE void
+// Accessor to set the discriminant.
+ACE_INLINE
+void
 GIOP::TargetAddress::_d (CORBA::Short discval)
 {
   this->disc_ = discval;
 }
-// accessor to get the discriminant
-ACE_INLINE CORBA::Short
+
+// Accessor to get the discriminant.
+ACE_INLINE
+CORBA::Short
 GIOP::TargetAddress::_d (void) const
 {
   return this->disc_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:899
 
-// accessor to set the member
-ACE_INLINE void
-GIOP::TargetAddress::object_key (const TAO_ObjectKey &val)
+// Accessor to set the member.
+ACE_INLINE
+void
+GIOP::TargetAddress::object_key (const TAO::ObjectKey &val)
 {
-  // set the discriminant val
+  // Set the discriminant value.
   this->_reset (0, 0);
   this->disc_ = 0;
   ACE_NEW (
       this->u_.object_key_,
-      TAO_ObjectKey (val)
+      TAO::ObjectKey (val)
     );
 }
 
-// readonly get method
-ACE_INLINE const TAO_ObjectKey &
+// Readonly get method.
+ACE_INLINE
+const TAO::ObjectKey &
 GIOP::TargetAddress::object_key (void) const
 {
   return *this->u_.object_key_;
 }
 
-// read/write get method
-ACE_INLINE TAO_ObjectKey &
+// Read/write get method.
+ACE_INLINE
+TAO::ObjectKey &
 GIOP::TargetAddress::object_key (void)
 {
   return *this->u_.object_key_;
 }
 
-// accessor to set the member
-ACE_INLINE void
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+
+// Accessor to set the member.
+ACE_INLINE
+void
 GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
 {
-  // set the discriminant val
+  // Set the discriminant value.
   this->_reset (1, 0);
   this->disc_ = 1;
   ACE_NEW (
@@ -274,25 +477,31 @@ GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
     );
 }
 
-// readonly get method
-ACE_INLINE const IOP::TaggedProfile &
+// Readonly get method.
+ACE_INLINE
+const IOP::TaggedProfile &
 GIOP::TargetAddress::profile (void) const
 {
   return *this->u_.profile_;
 }
 
-// read/write get method
-ACE_INLINE IOP::TaggedProfile &
+// Read/write get method.
+ACE_INLINE
+IOP::TaggedProfile &
 GIOP::TargetAddress::profile (void)
 {
   return *this->u_.profile_;
 }
 
-// accessor to set the member
-ACE_INLINE void
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+
+// Accessor to set the member.
+ACE_INLINE
+void
 GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
 {
-  // set the discriminant val
+  // Set the discriminant value.
   this->_reset (2, 0);
   this->disc_ = 2;
   ACE_NEW (
@@ -301,133 +510,159 @@ GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
     );
 }
 
-// readonly get method
-ACE_INLINE const GIOP::IORAddressingInfo &
+// Readonly get method.
+ACE_INLINE
+const GIOP::IORAddressingInfo &
 GIOP::TargetAddress::ior (void) const
 {
   return *this->u_.ior_;
 }
 
-// read/write get method
-ACE_INLINE GIOP::IORAddressingInfo &
+// Read/write get method.
+ACE_INLINE
+GIOP::IORAddressingInfo &
 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) // default constructor
+GIOP::TargetAddress_var::TargetAddress_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (GIOP::TargetAddress *p)
+GIOP::TargetAddress_var::TargetAddress_var (TargetAddress *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (const GIOP::TargetAddress_var &p) // copy constructor
+GIOP::TargetAddress_var::TargetAddress_var (const ::GIOP::TargetAddress_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, GIOP::TargetAddress (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::GIOP::TargetAddress (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::~TargetAddress_var (void) // destructor
+GIOP::TargetAddress_var::~TargetAddress_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (GIOP::TargetAddress *p)
+ACE_INLINE
+::GIOP::TargetAddress_var &
+GIOP::TargetAddress_var::operator= (TargetAddress *_tao_union_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_union_var;
   return *this;
 }
 
-ACE_INLINE GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (const GIOP::TargetAddress_var &p)
+ACE_INLINE
+::GIOP::TargetAddress_var &
+GIOP::TargetAddress_var::operator= (const ::GIOP::TargetAddress_var &_tao_union_var)
 {
-  if (this != &p)
+  if (this != &_tao_union_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_union_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          GIOP::TargetAddress *deep_copy =
-            new GIOP::TargetAddress (*p.ptr_);
-
+          TargetAddress *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              TargetAddress (*_tao_union_var.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
-              GIOP::TargetAddress *tmp = deep_copy;
+              TargetAddress *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const GIOP::TargetAddress *
+ACE_INLINE
+const ::GIOP::TargetAddress *
 GIOP::TargetAddress_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::operator const GIOP::TargetAddress &() const // cast
+GIOP::TargetAddress_var::operator const ::GIOP::TargetAddress &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::operator GIOP::TargetAddress &() // cast
+GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::operator GIOP::TargetAddress &() const// cast
+GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() const// cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const GIOP::TargetAddress &
+// 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 &
+ACE_INLINE
+::GIOP::TargetAddress &
 GIOP::TargetAddress_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE GIOP::TargetAddress *&
+// Mapping for variable size.
+ACE_INLINE
+::GIOP::TargetAddress *&
 GIOP::TargetAddress_var::out (void)
 {
   delete this->ptr_;
@@ -435,40 +670,43 @@ GIOP::TargetAddress_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_var::_retn (void)
 {
-  GIOP::TargetAddress *tmp = this->ptr_;
+  ::GIOP::TargetAddress *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+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 (GIOP::TargetAddress *&p)
+GIOP::TargetAddress_out::TargetAddress_out (TargetAddress *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (GIOP::TargetAddress_var &p) // constructor from _var
+GIOP::TargetAddress_out::TargetAddress_out (TargetAddress_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -476,236 +714,153 @@ GIOP::TargetAddress_out::TargetAddress_out (GIOP::TargetAddress_var &p) // const
 }
 
 ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (const GIOP::TargetAddress_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (GIOP::TargetAddress_out&,p).ptr_)
+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)
+ACE_INLINE
+::GIOP::TargetAddress_out &
+GIOP::TargetAddress_out::operator= (const ::GIOP::TargetAddress_out &p)
 {
-  this->ptr_ = ACE_const_cast (GIOP::TargetAddress_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (TargetAddress_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (GIOP::TargetAddress *p)
+ACE_INLINE
+::GIOP::TargetAddress_out &
+GIOP::TargetAddress_out::operator= (TargetAddress *_tao_union_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_union_out;
   return *this;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_out::operator GIOP::TargetAddress *&() // cast
+GIOP::TargetAddress_out::operator ::GIOP::TargetAddress *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *&
+ACE_INLINE
+::GIOP::TargetAddress *&
 GIOP::TargetAddress_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for class GIOP::Version_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::Version_var::Version_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::Version_var::Version_var (Version *p)
-  : ptr_ (p)
-{}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version_var &p) // copy constructor
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const GIOP::Version &_tao_aggregate
+  )
 {
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::GIOP::Version (*p.ptr_));
+  if (
+    (strm << CORBA::Any::from_octet (_tao_aggregate.major)) &&
+    (strm << CORBA::Any::from_octet (_tao_aggregate.minor))
+   )
+    {
+      return 1;
+    }
   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) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE GIOP::Version_var &
-GIOP::Version_var::operator= (Version *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version_var &p)
-{
-  if (this != &p)
     {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Version *deep_copy =
-            new Version (*p.ptr_);
-
-          if (deep_copy != 0)
-            {
-              Version *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
+      return 0;
     }
-
-  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
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    GIOP::Version &_tao_aggregate
+  )
 {
-  return *this->ptr_;
+  if (
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) &&
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor))
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() // cast
-{
-  return *this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 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_;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const GIOP::IORAddressingInfo &_tao_aggregate)
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const GIOP::IORAddressingInfo &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.selected_profile_index) &&
     (strm << _tao_aggregate.ior)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::IORAddressingInfo &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    GIOP::IORAddressingInfo &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.selected_profile_index) &&
     (strm >> _tao_aggregate.ior)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const GIOP::Version &ver)
-{
-  if ((strm.write_octet (ver.major)) &&
-      (strm.write_octet (ver.minor)))
-    return 1;
-  else
-    return 0;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
-}
+#if !defined _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
+#define _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::Version &ver)
-{
-  if ((strm.read_octet (ver.major)) &&
-       (strm.read_octet (ver.minor)))
-      return 1;
-      else
-      return 0;
-}
+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 CORBA::Boolean operator<< (
+ACE_INLINE
+CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const GIOP::TargetAddress &_tao_union
   )
@@ -714,7 +869,9 @@ ACE_INLINE CORBA::Boolean operator<< (
     {
       return 0;
     }
+  
   CORBA::Boolean result = 1;
+  
   switch (_tao_union._d ())
   {
     case 0:
@@ -735,10 +892,12 @@ ACE_INLINE CORBA::Boolean operator<< (
     default:
       break;
   }
+  
   return result;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (
+ACE_INLINE
+CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     GIOP::TargetAddress &_tao_union
   )
@@ -748,36 +907,52 @@ ACE_INLINE CORBA::Boolean operator>> (
     {
       return 0;
     }
+  
   CORBA::Boolean result = 1;
+  
   switch (_tao_discriminant)
   {
     case 0:
       {
-        TAO_ObjectKey _tao_union_tmp;
+        TAO::ObjectKey _tao_union_tmp;
         result = strm >> _tao_union_tmp;
+        
         if (result)
-          _tao_union.object_key (_tao_union_tmp);
+          {
+            _tao_union.object_key (_tao_union_tmp);
+            _tao_union._d (_tao_discriminant);
+          }
       }
       break;
     case 1:
       {
         IOP::TaggedProfile _tao_union_tmp;
         result = strm >> _tao_union_tmp;
+        
         if (result)
-          _tao_union.profile (_tao_union_tmp);
+          {
+            _tao_union.profile (_tao_union_tmp);
+            _tao_union._d (_tao_discriminant);
+          }
       }
       break;
     case 2:
       {
         GIOP::IORAddressingInfo _tao_union_tmp;
         result = strm >> _tao_union_tmp;
+        
         if (result)
-          _tao_union.ior (_tao_union_tmp);
+          {
+            _tao_union.ior (_tao_union_tmp);
+            _tao_union._d (_tao_discriminant);
+          }
       }
       break;
     default:
       _tao_union._d (_tao_discriminant);
       break;
   }
+  
   return result;
 }
+